Merge branch 'PHP-5.6'

laruence · laruence · commit aa5b3b0e4a70 · 2015-01-09T11:54:01.000+08:00
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
@@ -1469,7 +1469,7 @@ static void zend_jmp_optimization(zend_code_block *block, zend_op_array *op_arra
 					}
 
 					/* next block is only NOP's */
-					if (target == target_end) {
+					if (target == target_end && ! block->follow_to->protected) {
 						del_source(block, block->follow_to);
 						block->follow_to = block->follow_to->follow_to;
 						ADD_SOURCE(block, block->follow_to);

Original file line number	Diff line number	Diff line change
`@@ -1469,7 +1469,7 @@ static void zend_jmp_optimization(zend_code_block block, zend_op_array op_arra`
`1469`	`1469`	`}`
`1470`	`1470`
`1471`	`1471`	`/* next block is only NOP's */`
`1472`		`- if (target == target_end) {`
	`1472`	`+ if (target == target_end && ! block->follow_to->protected) {`
`1473`	`1473`	`del_source(block, block->follow_to);`
`1474`	`1474`	`block->follow_to = block->follow_to->follow_to;`
`1475`	`1475`	`ADD_SOURCE(block, block->follow_to);`