diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-05-13 12:55:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-05-13 12:55:42 +0300 |
| commit | d72a94468efc9016b0bfbf80658b73702e320025 (patch) | |
| tree | d7d04d030860d55cec0d716028fb1c0b01b5f7c0 /Zend/zend_opcode.c | |
| parent | 6254184a4ddeb0f3ba022df41a61de2d1c394d1b (diff) | |
| download | php-git-d72a94468efc9016b0bfbf80658b73702e320025.tar.gz | |
Merged FE_FETCH_R[W] with the following ASSIGN[_REF] when assigne to CV.
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 43ba64ad3f..f24fc9f193 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -797,11 +797,13 @@ ZEND_API int pass_two(zend_op_array *op_array) case ZEND_NEW: case ZEND_FE_RESET_R: case ZEND_FE_RESET_RW: - case ZEND_FE_FETCH_R: - case ZEND_FE_FETCH_RW: case ZEND_ASSERT_CHECK: ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op2); break; + case ZEND_FE_FETCH_R: + case ZEND_FE_FETCH_RW: + opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value); + break; case ZEND_VERIFY_RETURN_TYPE: if (op_array->fn_flags & ZEND_ACC_GENERATOR) { MAKE_NOP(opline); |