com php-src: Fix broken merge: Zend/zend_compile.c

From: Date: Sun, 20 Mar 2016 00:35:51 +0000
Subject: com php-src: Fix broken merge: Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91422@lists.php.net to get a copy of this message
Commit: 24f63b1c320cd5d079ba7de40482a9f2067a1c7a Author: Nikita Popov <nikic@php.net> Sun, 20 Mar 2016 01:34:56 +0100 Parents: 80a722a6346e838ed91e5526b5927121d4abe2bb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24f63b1c320cd5d079ba7de40482a9f2067a1c7a Log: Fix broken merge Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d05872e..269864f 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 ||

« previous php.cvs (#91422) next »