Optimization (IS_TMP_VARs don't need reference counting)

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 563aa7a221a00caf1afbbcd9cfed7f254fcbcf92..bd326022d6601c50231cc4549057331c9ca45766 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3389,7 +3389,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
                        CACHE_PTR(opline->op2.literal->cache_slot, c);
                }
                retval = &EX_T(opline->result.var).tmp_var;
-               INIT_PZVAL_COPY(retval, &c->value);
+               ZVAL_COPY_VALUE(retval, &c->value);
                zval_copy_ctor(retval);
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 47cc50ac925275c7ebd26baeb51b31da2cd8846f..f4669f9019e8b42b349b189fc4dde1e25e298e7e 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3276,7 +3276,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
                        CACHE_PTR(opline->op2.literal->cache_slot, c);
                }
                retval = &EX_T(opline->result.var).tmp_var;
-               INIT_PZVAL_COPY(retval, &c->value);
+               ZVAL_COPY_VALUE(retval, &c->value);
                zval_copy_ctor(retval);
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();
@@ -13086,7 +13086,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
                        CACHE_PTR(opline->op2.literal->cache_slot, c);
                }
                retval = &EX_T(opline->result.var).tmp_var;
-               INIT_PZVAL_COPY(retval, &c->value);
+               ZVAL_COPY_VALUE(retval, &c->value);
                zval_copy_ctor(retval);
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();
@@ -21675,7 +21675,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
                        CACHE_PTR(opline->op2.literal->cache_slot, c);
                }
                retval = &EX_T(opline->result.var).tmp_var;
-               INIT_PZVAL_COPY(retval, &c->value);
+               ZVAL_COPY_VALUE(retval, &c->value);
                zval_copy_ctor(retval);
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();