com php-src: Fixed bug (try block removed while combined with xdebug): NEWS ext/opcache/Optimizer/block_pass.c

Commit: 0547edb5c239a8cbfb7a1d16d85ee365480527dd Author: Xinchen Hui <laruence@php.net> Fri, 9 Jan 2015 11:53:47 +0800 Parents: 16b6f6c7f49a6a0e64ce2b20893eb794886c1376 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0547edb5c239a8cbfb7a1d16d85ee365480527dd Log: Fixed bug (try block removed while combined with xdebug) Changed paths: M NEWS M ext/opcache/Optimizer/block_pass.c Diff: diff --git a/NEWS b/NEWS index 8e61cdf..cb5f86a 100644 --- 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 index fff5d7e..649d613 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);