summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/opcache/Optimizer/block_pass.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 8e61cdf363..cb5f86ae96 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 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);