diff options
author | Nikita Popov <nikic@php.net> | 2015-05-22 22:08:44 +0200 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2015-05-23 10:51:33 +0200 |
commit | 9325ada7253efb330e4fd79579d6e6fc0334d7b2 (patch) | |
tree | 1d4782f080f89f4d781942919f8bcd4a79005aa9 /Zend/zend_opcode.c | |
parent | 3cbe3903faa8f02b6828d9d496816d3334ea2b00 (diff) | |
download | php-git-9325ada7253efb330e4fd79579d6e6fc0334d7b2.tar.gz |
Embed break/continue depth into opline
Previously a separate lval literal was used - this is probably a
leftover from the time where the break level could still be
specified dynamically.
Diffstat (limited to 'Zend/zend_opcode.c')
-rw-r--r-- | Zend/zend_opcode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index f24fc9f193..933c75a706 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -682,11 +682,11 @@ static void zend_resolve_finally_calls(zend_op_array *op_array) case ZEND_BRK: case ZEND_CONT: { - int nest_levels, array_offset; + int nest_levels = opline->op2.num; + int array_offset = opline->op1.num; zend_brk_cont_element *jmp_to; - nest_levels = Z_LVAL(op_array->literals[opline->op2.constant]); - if ((array_offset = opline->op1.opline_num) != -1) { + if (array_offset != -1) { do { jmp_to = &op_array->brk_cont_array[array_offset]; if (nest_levels > 1) { |