diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-20 01:34:56 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-20 01:35:51 +0100 |
| commit | 24f63b1c320cd5d079ba7de40482a9f2067a1c7a (patch) | |
| tree | cdf348038f7386222254d3ff4baf700cadf414f7 | |
| parent | 80a722a6346e838ed91e5526b5927121d4abe2bb (diff) | |
| download | php-git-24f63b1c320cd5d079ba7de40482a9f2067a1c7a.tar.gz | |
Fix broken merge
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d05872e6c0..269864f47b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -737,11 +737,7 @@ void zend_do_free(znode *op1) /* {{{ */ } } - opline = get_next_op(CG(active_op_array)); - - opline->opcode = ZEND_FREE; - SET_NODE(opline->op1, op1); - SET_UNUSED(opline->op2); + zend_emit_op(NULL, ZEND_FREE, op1, NULL); } else if (op1->op_type == IS_VAR) { zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1]; while (opline->opcode == ZEND_END_SILENCE || |