com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_c ompile.h Zend/zend_opcode.c Zend/zend_vm_def.h Zend/zend_vm_execute.h

Commit: 550b3e4306124fbf65602c7e3a99653427ed8c8d Author: Xinchen Hui <laruence@php.net> Fri, 18 Jul 2014 15:48:56 +0800 Parents: 84673485f5b3134e357f6ec90bbaab9ffec11a68 ba1cf321f301410cc5b3da61e106040187f1787b Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=550b3e4306124fbf65602c7e3a99653427ed8c8d Log: Merge branch 'PHP-5.5' into PHP-5.6 Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h Changed paths: MM Zend/zend_compile.h MM Zend/zend_opcode.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h Diff: diff --cc Zend/zend_vm_def.h index c3fb86d,161dd77..d9e7347 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@@ -5631,8 -5402,7 +5631,8 @@@ ZEND_VM_HANDLER(162, ZEND_FAST_CALL, AN ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.opline_num]); ZEND_VM_CONTINUE(); } - EX(fast_ret) = opline + 1; + EX(fast_ret) = opline; + EX(delayed_exception) = NULL; ZEND_VM_SET_OPCODE(opline->op1.jmp_addr); ZEND_VM_CONTINUE(); } diff --cc Zend/zend_vm_execute.h index 3fa94d1,c94c2d7..7499a32 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@@ -1350,8 -1143,7 +1350,8 @@@ static int ZEND_FASTCALL ZEND_FAST_CAL ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.opline_num]); ZEND_VM_CONTINUE(); } - EX(fast_ret) = opline + 1; + EX(fast_ret) = opline; + EX(delayed_exception) = NULL; ZEND_VM_SET_OPCODE(opline->op1.jmp_addr); ZEND_VM_CONTINUE(); }