From: Nikita Popov <nikic@php.net>
Date: Sun, 20 Mar 2016 00:34:56 +0000 (+0100)
Subject: Fix broken merge
X-Git-Tag: php-7.1.0alpha1~447
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24f63b1c320cd5d079ba7de40482a9f2067a1c7a;p=php

Fix broken merge
---

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 ||