com php-src: Merge branch 'PHP-5.6': ext/opcache/Optimizer/pass2.c

From: Date: Fri, 19 Dec 2014 20:51:05 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/opcache/Optimizer/pass2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83807@lists.php.net to get a copy of this message
Commit: c94f62d0d98f4373bbf8f68c234b16d52c5f3273 Author: Nikita Popov <nikic@php.net> Fri, 19 Dec 2014 21:51:05 +0100 Parents: 00628afd74c9b133dad5d2b3052d17153e5e9320 87ccf50badc9926260b62ca466bdd515901815fd Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c94f62d0d98f4373bbf8f68c234b16d52c5f3273 Log: Merge branch 'PHP-5.6' Conflicts: ext/opcache/Optimizer/pass2.c Changed paths: MM ext/opcache/Optimizer/pass2.c Diff: diff --cc ext/opcache/Optimizer/pass2.c index 4c839ed,8704b78..b1c6772 --- a/ext/opcache/Optimizer/pass2.c +++ b/ext/opcache/Optimizer/pass2.c @@@ -189,11 -160,11 +189,10 @@@ void zend_optimizer_pass2(zend_op_arra int nest_levels; int dont_optimize = 0; -- if (ZEND_OP2_TYPE(opline) != IS_CONST) { -- break; -- } -- convert_to_long(&ZEND_OP2_LITERAL(opline)); -- nest_levels = ZEND_OP2_LITERAL(opline).value.lval; ++ ZEND_ASSERT(ZEND_OP2_TYPE(opline) == IS_CONST); ++ ZEND_ASSERT(Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_LONG); ++ ++ nest_levels = Z_LVAL(ZEND_OP2_LITERAL(opline)); array_offset = ZEND_OP1(opline).opline_num; while (1) { @@@ -204,8 -175,9 +203,7 @@@ jmp_to = &op_array->brk_cont_array[array_offset]; array_offset = jmp_to->parent; if (--nest_levels > 0) { - if (opline->opcode == ZEND_BRK && - op_array->opcodes[jmp_to->brk].opcode == ZEND_FREE) { - if (op_array->opcodes[jmp_to->brk].opcode == ZEND_FREE || - op_array->opcodes[jmp_to->brk].opcode == ZEND_SWITCH_FREE - ) { ++ if (op_array->opcodes[jmp_to->brk].opcode == ZEND_FREE) { dont_optimize = 1; break; }

« previous php.cvs (#83807) next »