diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-29 13:03:28 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-29 13:03:53 +0200 |
| commit | a22a06c351805c066848d37274cae9e79de08730 (patch) | |
| tree | c17c11e5eb156188d722fb7fe0fd6a3f914e1ba9 | |
| parent | 92273bef661ed4eb4630d0a4b91b5a633c7da665 (diff) | |
| parent | 8e63bb5e465620f27de93dea82e0d84be72da7f3 (diff) | |
| download | php-git-a22a06c351805c066848d37274cae9e79de08730.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/dfa_pass.c | 14 | ||||
| -rw-r--r-- | ext/opcache/tests/bug78341.phpt | 21 |
3 files changed, 31 insertions, 7 deletions
@@ -15,6 +15,9 @@ PHP NEWS . Fixed bug #78342 (Bus error in configure test for iconv //IGNORE). (Rainer Jung) +- Opcache: + . Fixed bug #78341 (Failure to detect smart branch in DFA pass). (Nikita) + 25 Jul 2019, PHP 7.4.0beta1 - Core: diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index 704cca1835..4204f53805 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -181,9 +181,8 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa, zend_op for (b = blocks; b < blocks_end; b++) { if (b->flags & (ZEND_BB_REACHABLE|ZEND_BB_UNREACHABLE_FREE)) { - uint32_t end; - if (b->len) { + uint32_t new_start, old_end; while (i < b->start) { shiftlist[i] = i - target; i++; @@ -196,9 +195,9 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa, zend_op b->len = 1; } - end = b->start + b->len; - b->start = target; - while (i < end) { + new_start = target; + old_end = b->start + b->len; + while (i < old_end) { shiftlist[i] = i - target; if (EXPECTED(op_array->opcodes[i].opcode != ZEND_NOP) || is_smart_branch_inhibiting_nop(op_array, target, i, b, blocks_end)) { @@ -211,12 +210,13 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa, zend_op } i++; } - if (target != end) { + b->start = new_start; + if (target != old_end) { zend_op *opline; zend_op *new_opline; b->len = target - b->start; - opline = op_array->opcodes + end - 1; + opline = op_array->opcodes + old_end - 1; if (opline->opcode == ZEND_NOP) { continue; } diff --git a/ext/opcache/tests/bug78341.phpt b/ext/opcache/tests/bug78341.phpt new file mode 100644 index 0000000000..8b10125068 --- /dev/null +++ b/ext/opcache/tests/bug78341.phpt @@ -0,0 +1,21 @@ +--TEST-- +Bug #78341: Failure to detect smart branch in DFA pass +--FILE-- +<?php + +function test($a) { + // Just some dead code... + if (strpos("foo", "foo") !== 0) { + echo "Foo"; + } + + $x = $a === null; + if ($x) { + var_dump($x); + } +} +test(null); + +?> +--EXPECT-- +bool(true) |