Fixed CFG construction for SWITCH opcodes

dstogov · dstogov · commit 56a5d0bd9179 · 2019-04-03T03:09:03.000+03:00
diff --git 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;
 					}

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ static void zend_mark_reachable(zend_op opcodes, zend_cfg cfg, zend_basic_bloc`
`74`	`74`	`}`
`75`	`75`	`} else {`
`76`	`76`	`ZEND_ASSERT(opcode == ZEND_SWITCH_LONG \|\| opcode == ZEND_SWITCH_STRING);`
`77`		`- if (i == b->successors_count) {`
`78`		`- succ->flags \|= ZEND_BB_FOLLOW;`
	`77`	`+ if (i == b->successors_count - 1) {`
	`78`	`+ succ->flags \|= ZEND_BB_FOLLOW \| ZEND_BB_TARGET;`
`79`	`79`	`} else {`
`80`	`80`	`succ->flags \|= ZEND_BB_TARGET;`
`81`	`81`	`}`