Fixed bug (try block removed while combined with xdebug)

laruence · laruence · commit 0547edb5c239 · 2015-01-09T11:53:47.000+08:00
diff --git a/NEWS b/NEWS
@@ -58,6 +58,7 @@
     (Ashesh Vashi)
 
 - Opcache:
+  . Fixed bug (try block removed while combined with xdebug). (Laruence)
   . Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8
     + Opcache). (Laruence)
   . Fixed bug #67111 (Memory leak when using "continue 2" inside two foreach
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
@@ -1578,7 +1578,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
`@@ -1578,7 +1578,7 @@ static void zend_jmp_optimization(zend_code_block block, zend_op_array op_arra`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`	`1580`	`/* next block is only NOP's */`
`1581`		`- if (target == target_end) {`
	`1581`	`+ if (target == target_end && ! block->follow_to->protected) {`
`1582`	`1582`	`del_source(block, block->follow_to);`
`1583`	`1583`	`block->follow_to = block->follow_to->follow_to;`
`1584`	`1584`	`ADD_SOURCE(block, block->follow_to);`