diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-04-27 22:17:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-04-27 22:21:59 +0200 |
| commit | 6738d19fb80b8696f163cae4b9c114c247606daa (patch) | |
| tree | d6c3f412f0d1305b440d7b4bf962ef1bb01877fb | |
| parent | 279ba58edbd0454d7e534e223e3538a2b0b5ff9b (diff) | |
| download | php-git-6738d19fb80b8696f163cae4b9c114c247606daa.tar.gz | |
Fix bug #76281
Make sure we keep the smart-branch inhibiting NOP even if there
are multiple NOPs in sequence.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/dfa_pass.c | 7 | ||||
| -rw-r--r-- | ext/opcache/tests/bug76281.phpt | 28 |
3 files changed, 34 insertions, 3 deletions
@@ -9,6 +9,8 @@ PHP NEWS - Opcache: . Fixed bug #76275 (Assertion failure in file cache when unserializing empty try_catch_array). (Nikita) + . Fixed bug #76281 (Opcache causes incorrect "undefined variable" errors). + (Nikita) - Reflection: . Fixed arginfo for array_replace(_recursive) and array_merge(_recursive). diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index bb22665594..34d5de835a 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -144,12 +144,13 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa) while (i < end) { shiftlist[i] = i - target; if (EXPECTED(op_array->opcodes[i].opcode != ZEND_NOP) || - /*keep NOP to support ZEND_VM_SMART_BRANCH */ - (i > 0 && + /* Keep NOP to support ZEND_VM_SMART_BRANCH. Using "target-1" instead of + * "i-1" here to check the last non-NOP instruction. */ + (target > 0 && i + 1 < op_array->last && (op_array->opcodes[i+1].opcode == ZEND_JMPZ || op_array->opcodes[i+1].opcode == ZEND_JMPNZ) && - zend_is_smart_branch(op_array->opcodes + i - 1))) { + zend_is_smart_branch(op_array->opcodes + target - 1))) { if (i != target) { op_array->opcodes[target] = op_array->opcodes[i]; ssa->ops[target] = ssa->ops[i]; diff --git a/ext/opcache/tests/bug76281.phpt b/ext/opcache/tests/bug76281.phpt new file mode 100644 index 0000000000..83c42f3a28 --- /dev/null +++ b/ext/opcache/tests/bug76281.phpt @@ -0,0 +1,28 @@ +--TEST-- +Bug #76281: Opcache causes incorrect "undefined variable" errors +--FILE-- +<?php + +function test($r, $action) { + $user_sub_resource = in_array($action, array('get_securityquestions', 'get_status', 'get_groupstats')); + + $user_id = null; + if ($user_sub_resource && isset($r['user_id'])) { + $user_id = $r['user_id']; + } + else if (isset($r['id'])) { + $user_id = $r['id']; + } + + if ($user_sub_resource) { + return 'foo'; + } + + return 'bar'; +} + +var_dump(test(['user_id' => 1, 'id' => 2], 'foo')); + +?> +--EXPECT-- +string(3) "bar" |