com php-src: Don't insert duplicate predecessors: ext/opcache/O ptimizer/zend_cfg.c
| From: | Nikita Popov | Date: | Sun, 24 Jan 2016 22:03:57 +0000 |
| Subject: | com php-src: Don't insert duplicate predecessors: ext/opcache/O ptimizer/zend_cfg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90743@lists.php.net to get a copy of this message | ||
Commit: 949aaea66ee2bd7171e802a2f1a4fa2efbd03e6c
Author: Nikita Popov <nikic@php.net> Sat, 23 Jan 2016 16:27:19 +0100
Parents: cf6aa46dbd70539c66a722d7f165cac242c9e1db
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=949aaea66ee2bd7171e802a2f1a4fa2efbd03e6c
Log:
Don't insert duplicate predecessors
Otherwise we'll get corrupt phis
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 a712231..6df4d3c 100644
--- a/ext/opcache/Optimizer/zend_cfg.c
+++ b/ext/opcache/Optimizer/zend_cfg..c
@@ -535,7 +535,7 @@ int zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg) /* {{{ */
if (b->successors[0] >= 0) {
edges++;
blocks[b->successors[0]].predecessors_count++;
- if (b->successors[1] >= 0) {
+ if (b->successors[1] >= 0 && b->successors[1] != b->successors[0]) {
edges++;
blocks[b->successors[1]].predecessors_count++;
}
@@ -564,7 +564,8 @@ int zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg) /* {{{ */
zend_basic_block *b = blocks + blocks[j].successors[0];
predecessors[b->predecessor_offset + b->predecessors_count] = j;
b->predecessors_count++;
- if (blocks[j].successors[1] >= 0) {
+ if (blocks[j].successors[1] >= 0
+ && blocks[j].successors[1] != blocks[j].successors[0]) {
zend_basic_block *b = blocks + blocks[j].successors[1];
predecessors[b->predecessor_offset + b->predecessors_count] = j;
b->predecessors_count++;