From: Nikita Popov <nikic@php.net>
Date: Fri, 18 Jul 2014 18:24:44 +0000 (+0200)
Subject: Cleanup
X-Git-Tag: POST_AST_MERGE^2~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9f62be2e6dda239fd7098e3a3b0e4d164049c03;p=php

Cleanup
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4f53a53fed..6b5daf971d 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6046,7 +6046,7 @@ void zend_compile_foreach(zend_ast *ast TSRMLS_DC) {
 
 	if (key_ast) {
 		opline->result_type = IS_TMP_VAR;
-		opline->result.opline_num = get_temporary_variable(CG(active_op_array));
+		opline->result.var = get_temporary_variable(CG(active_op_array));
 		GET_NODE(&key_node, opline->result);
 	}
 
@@ -6515,7 +6515,6 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) {
 	} else {
 		opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 		opline->opcode = ZEND_DECLARE_FUNCTION;
-		opline->extended_value = ZEND_DECLARE_FUNCTION;
 		opline->op2_type = IS_CONST;
 		LITERAL_STR(opline->op2, STR_COPY(lcname));
 	}