com php-src: Fix missing LOAD_OPLINE() for ZEND_USE R_OPCODE_LEAVE: Zend/zend_vm_def.h Zend/zend_ vm_execute.h

Commit: abf6a0b376b42e0ce60da039b11c6fdf994431fb Author: Bob Weinand <bobwei9@hotmail.com> Thu, 24 Sep 2015 21:06:07 +0200 Parents: 808f62bb4d9812e9b7b35c87f3e90e5fc2bc244b Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abf6a0b376b42e0ce60da039b11c6fdf994431fb Log: Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index daad1c1..f0e7278 100644 --- 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 ea01110..253a2d7 100644 --- 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);