Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index daad1c120d4351161f3142512733a12fb8aa8dcc..f0e7278459f7b5d2ed008cb726798416306969dc 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -7196,6 +7196,7 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY)
                case ZEND_USER_OPCODE_ENTER:
                        ZEND_VM_ENTER();
                case ZEND_USER_OPCODE_LEAVE:
+                       LOAD_OPLINE();
                        ZEND_VM_LEAVE();
                case ZEND_USER_OPCODE_DISPATCH:
                        ZEND_ASSERT(EX(opline) == opline);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ea01110d9615f634b904b78e6dc4f09cac4bced7..253a2d7a13ea6854dd1a4b769108c9ee8281d6d3 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1583,6 +1583,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_
                case ZEND_USER_OPCODE_ENTER:
                        ZEND_VM_ENTER();
                case ZEND_USER_OPCODE_LEAVE:
+                       LOAD_OPLINE();
                        ZEND_VM_LEAVE();
                case ZEND_USER_OPCODE_DISPATCH:
                        ZEND_ASSERT(EX(opline) == opline);