From a4c7c55c0b63ddbccc724248ae317d391ea0b001 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 10 Apr 2017 23:51:27 +0200 Subject: [PATCH] Move call/recv splitting into correct branch --- ext/opcache/Optimizer/zend_cfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c index 5524bff191..3eac1f69d9 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) { -- 2.50.1