com php-src: Move call/recv splitting into correct branch: ext/opcache/Optimizer/zend_cfg.c

[email protected] (Nikita Popov)
Newsgroups php.cvs
Message-ID <[email protected]>
Commit:    a4c7c55c0b63ddbccc724248ae317d391ea0b001
Author:    Nikita Popov <[email protected]>         Mon, 10 Apr 2017 23:51:27 +0200
Parents:   e92896f735b876622c1115997f26542f33648291
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=a4c7c55c0b63ddbccc724248ae317d391ea0b001

Log:
Move call/recv splitting into correct branch

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 5524bff..3eac1f6 100644
--- a/ext/opcache/Optimizer/zend_cfg.c
+++ b/ext/opcache/Optimizer/zend_cfg.c
@@ -45,6 +45,8 @@ static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_bloc
 				if (b->successors_count == 1) {
 					if (opcode == ZEND_JMP) {
 						succ->flags |= ZEND_BB_TARGET;
+					} else {
+						succ->flags |= ZEND_BB_FOLLOW;
 
 						if (cfg->split_at_calls) {
 							if (opcode == ZEND_INCLUDE_OR_EVAL ||
@@ -63,8 +65,6 @@ static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_bloc
 								b->flags |= ZEND_BB_RECV_ENTRY;
 							}
 						}
-					} else {
-						succ->flags |= ZEND_BB_FOLLOW;
 					}
 				} else if (b->successors_count == 2) {
 					if (i == 0 || opcode == ZEND_JMPZNZ) {
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.