Fix CALL_TRAMPOLINE without global regs

The opline needs to be loaded here in any case. However
LOAD_OPLINE() is a no-op if global VM registers are not used.

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index fa1a187f148f025448a2914b596058aef0ebabd3..811de533c52da0ce30b6155c00e79f63c2a051ee 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end):
                ZEND_VM_RETURN();
        }
 
-       LOAD_OPLINE();
+       opline = execute_data->opline;
 
        if (object) {
                OBJ_RELEASE(object);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f991caf834d93f8e3c643d594f597d788442cdd2..7775c83894fca4ce2966d38542366e22b143b19d 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1893,7 +1893,7 @@ call_trampoline_end:
                ZEND_VM_RETURN();
        }
 
-       LOAD_OPLINE();
+       opline = execute_data->opline;
 
        if (object) {
                OBJ_RELEASE(object);