com php-src: Fixed CFG construction for SWITCH opcodes: ext/opcache/Optimizer/zend_cfg.c

From: Date: Wed, 03 Apr 2019 00:09:03 +0000
Subject: com php-src: Fixed CFG construction for SWITCH opcodes: ext/opcache/Optimizer/zend_cfg.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105503@lists.php.net to get a copy of this message
Commit: 56a5d0bd9179972d0675f8f772fc5423d9de00d0 Author: Dmitry Stogov <dmitry@zend.com> Wed, 3 Apr 2019 03:09:03 +0300 Parents: f7755163b7b8409c9265b1cc137e20c4e0ae5d8b Branches: PHP-7.2 PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56a5d0bd9179972d0675f8f772fc5423d9de00d0 Log: Fixed CFG construction for SWITCH opcodes Changed paths: M ext/opcache/Optimizer/zend_cfg.c Diff: diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c index e3f6045..a74d55e 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; }

« previous php.cvs (#105503) next »