From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 3 Apr 2019 00:09:03 +0000 (+0300)
Subject: Fixed CFG construction for SWITCH opcodes
X-Git-Tag: php-7.3.5RC1~29^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56a5d0bd9179972d0675f8f772fc5423d9de00d0;p=php

Fixed CFG construction for SWITCH opcodes
---

diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c
index e3f60452ef..a74d55e82e 100644
--- a/ext/opcache/Optimizer/zend_cfg.c
+++ b/ext/opcache/Optimizer/zend_cfg.c
@@ -74,8 +74,8 @@ static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_bloc
 					}
 				} else {
 					ZEND_ASSERT(opcode == ZEND_SWITCH_LONG || opcode == ZEND_SWITCH_STRING);
-					if (i == b->successors_count) {
-						succ->flags |= ZEND_BB_FOLLOW;
+					if (i == b->successors_count - 1) {
+						succ->flags |= ZEND_BB_FOLLOW | ZEND_BB_TARGET;
 					} else {
 						succ->flags |= ZEND_BB_TARGET;
 					}