Fix bad merge

In master the operand is fetched earlier, I didn't account for
that.

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c1e985ea1df4504867ffc7f3173df8cf7b056fc2..e73234a21cd36e1958b1d871d434a79bb5074210 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2312,7 +2312,7 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV)
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-               FREE_OP1_VAR_PTR();
+               FREE_UNFETCHED_OP1();
                FREE_OP2_VAR_PTR();
                HANDLE_EXCEPTION();
        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3203af2c8582c63648256557d95ce0068a4e8469..04ff3ebf2ac113c4fa4fe4e6d47a0f5474c59751 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -18504,7 +18504,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLE
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-               if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
+               zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);};
                HANDLE_EXCEPTION();
        }
@@ -20791,7 +20791,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-               if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
+               zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
 
                HANDLE_EXCEPTION();
        }