php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 05:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't insert duplicate predecessors

Browse Source 
Otherwise we'll get corrupt phis
This commit is contained in:
Nikita Popov
2016-01-23 16:27:19 +01:00
parent cf6aa46dbd
commit 949aaea66e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/opcache/Optimizer/zend_cfg.c
View File

@@ -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++;