diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-08-04 08:35:40 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-08-04 08:35:40 +0300 |
| commit | 58596897e97da0a3fae82a6a3b17bbfa1e7de689 (patch) | |
| tree | a0260a1f4afcdf08a40f393f753113f7bcff6d5e /Zend/zend_opcode.c | |
| parent | a16aa4c42c0483406b53518e28259162c1b7699f (diff) | |
| download | php-git-58596897e97da0a3fae82a6a3b17bbfa1e7de689.tar.gz | |
Get rid of ZEND_FAST_CALL_UNBOUND
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 237e7cd6f6..66ad24e98f 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -523,10 +523,8 @@ static void zend_resolve_fast_call(zend_op_array *op_array, uint32_t op_num) if (finally_op_num) { /* Must be ZEND_FAST_CALL */ ZEND_ASSERT(op_array->opcodes[finally_op_num - 2].opcode == ZEND_FAST_CALL); - if (op_array->opcodes[op_num].extended_value == 0) { - op_array->opcodes[op_num].extended_value = ZEND_FAST_CALL_FROM_FINALLY; - op_array->opcodes[op_num].op2.opline_num = finally_op_num - 2; - } + op_array->opcodes[op_num].extended_value = ZEND_FAST_CALL_FROM_FINALLY; + op_array->opcodes[op_num].op2.opline_num = finally_op_num - 2; } } @@ -603,10 +601,7 @@ ZEND_API int pass_two(zend_op_array *op_array) while (opline < end) { switch (opline->opcode) { case ZEND_FAST_CALL: - if (opline->extended_value == ZEND_FAST_CALL_UNBOUND) { - opline->op1.opline_num = op_array->try_catch_array[opline->op1.num].finally_op; - opline->extended_value = 0; - } + opline->op1.opline_num = op_array->try_catch_array[opline->op1.num].finally_op; zend_resolve_fast_call(op_array, opline - op_array->opcodes); ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op1); break; |