Fixed bug (try block removed while combined with xdebug)

diff --git a/NEWS b/NEWS
index 8e61cdf363225a23d24f99606c1fcc6185cbd20e..cb5f86ae965e595be29be0a2132da6e560f2b5a4 100644 (file)
--- 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 fff5d7e101630256b9e84f82aefe108591114e57..649d6133178f68ae28dfdaeb9ce7c8ce943bcbcd 100644 (file)
--- 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);