summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-01-09 11:53:47 +0800
committerXinchen Hui <laruence@php.net>2015-01-09 11:53:47 +0800
commit0547edb5c239a8cbfb7a1d16d85ee365480527dd (patch)
tree4dc33766e500634edc8d4919285732c0c0c21d57 /ext
parent16b6f6c7f49a6a0e64ce2b20893eb794886c1376 (diff)
downloadphp-git-0547edb5c239a8cbfb7a1d16d85ee365480527dd.tar.gz
Fixed bug (try block removed while combined with xdebug)
Diffstat (limited to 'ext')
-rw-r--r--ext/opcache/Optimizer/block_pass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index fff5d7e101..649d613317 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1578,7 +1578,7 @@ next_target:
}
/* 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);