Fix broken merge

nikic · nikic · commit 24f63b1c320c · 2016-03-20T01:35:51.000+01:00
diff --git 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 ||

Original file line number	Diff line number	Diff line change
`@@ -737,11 +737,7 @@ void zend_do_free(znode op1) / {{{ */`
`737`	`737`	`}`
`738`	`738`	`}`
`739`	`739`
`740`		`- opline = get_next_op(CG(active_op_array));`
`741`		`-`
`742`		`- opline->opcode = ZEND_FREE;`
`743`		`- SET_NODE(opline->op1, op1);`
`744`		`- SET_UNUSED(opline->op2);`
	`740`	`+ zend_emit_op(NULL, ZEND_FREE, op1, NULL);`
`745`	`741`	`} else if (op1->op_type == IS_VAR) {`
`746`	`742`	`zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];`
`747`	`743`	`while (opline->opcode == ZEND_END_SILENCE \|\|`