- Remove part of the cleanup which causes a problem with unnormal code

  like tests/lang/040.phpt
# However there is a memleak introduced somewhen after august 04 for such
# code now, 5.0 and 4.3 are fine though.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 429d913e344787eb028f08ecacacc28c51b0b9af..b893b12fb1d706cfe038649f2098168ef0cd0647 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3343,7 +3343,7 @@ void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type
 }
 
 
-void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, int variable TSRMLS_DC)
+void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable TSRMLS_DC)
 {
        zend_op *opline;
        zend_bool is_variable;
@@ -3367,9 +3367,6 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
                is_variable = 0;
        }
 
-       /* save the location of the beginning of the loop (array fetching) */
-       foreach_token->u.opline_num = get_next_op_number(CG(active_op_array));
-
        opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
        /* Preform array reset */
@@ -3395,17 +3392,10 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
                }
                zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline, sizeof(zend_op));
        }
-}
-
-
-void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znode *as_token, znode *value, znode *key, znode *cont_token TSRMLS_DC)
-{
-       zend_op *opline;
-       znode result_value, result_key, dummy;
-       zend_bool assign_by_ref=0;
-
-       cont_token->u.opline_num = get_next_op_number(CG(active_op_array));
        
+       /* save the location of the beginning of the loop (array fetching) */
+       opline->op2.u.opline_num = foreach_token->u.opline_num = get_next_op_number(CG(active_op_array));
+
        opline = get_next_op(CG(active_op_array) TSRMLS_CC);
        opline->opcode = ZEND_FE_FETCH;
        opline->result.op_type = IS_TMP_VAR;
@@ -3414,6 +3404,14 @@ void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znod
        opline->extended_value = 0;
        SET_UNUSED(opline->op2);
        *as_token = opline->result;
+}
+
+
+void zend_do_foreach_cont(znode *value, znode *key, znode *as_token, znode *foreach_token TSRMLS_DC)
+{
+       zend_op *opline;
+       znode result_value, result_key, dummy;
+       zend_bool assign_by_ref=0;
 
        if (key->op_type != IS_UNUSED) {
                znode *tmp;
@@ -3424,7 +3422,7 @@ void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znod
                value = tmp;
 
                /* Mark extended_value in case both key and value are being used */
-               CG(active_op_array)->opcodes[cont_token->u.opline_num].extended_value |= ZEND_FE_FETCH_WITH_KEY;
+               CG(active_op_array)->opcodes[foreach_token->u.opline_num].extended_value |= ZEND_FE_FETCH_WITH_KEY;
        }
 
        if ((key->op_type != IS_UNUSED) && (key->u.EA.type & ZEND_PARSED_REFERENCE_VARIABLE)) {
@@ -3433,11 +3431,11 @@ void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znod
        
        if (value->u.EA.type & ZEND_PARSED_REFERENCE_VARIABLE) {
                assign_by_ref = 1;
-               if (!CG(active_op_array)->opcodes[foreach_token->u.opline_num].extended_value) {
+               if (!CG(active_op_array)->opcodes[foreach_token->u.opline_num-1].extended_value) {
                        zend_error(E_COMPILE_ERROR, "Cannot create references to elements of a temporary array expression");
                }
                /* Mark extended_value for assign-by-reference */
-               CG(active_op_array)->opcodes[cont_token->u.opline_num].extended_value |= ZEND_FE_FETCH_BYREF;
+               CG(active_op_array)->opcodes[foreach_token->u.opline_num].extended_value |= ZEND_FE_FETCH_BYREF;
        }
 
        if (key->op_type != IS_UNUSED) {
@@ -3465,14 +3463,14 @@ void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znod
                opline->extended_value = ZEND_FETCH_STANDARD; /* ignored in fetch_dim_tmp_var, but what the hell. */
                result_key = opline->result;
        } else {
-               result_value = CG(active_op_array)->opcodes[cont_token->u.opline_num].result;
+               result_value = CG(active_op_array)->opcodes[foreach_token->u.opline_num].result;
        }
 
        if (assign_by_ref) {
                if (key->op_type == IS_UNUSED) {
                        /* Mark FE_FETCH as IS_VAR as it holds the data directly as a value */
-                       CG(active_op_array)->opcodes[cont_token->u.opline_num].result.op_type = IS_VAR;
-                       zend_do_assign_ref(NULL, value, &CG(active_op_array)->opcodes[cont_token->u.opline_num].result TSRMLS_CC);
+                       CG(active_op_array)->opcodes[foreach_token->u.opline_num].result.op_type = IS_VAR;
+                       zend_do_assign_ref(NULL, value, &CG(active_op_array)->opcodes[foreach_token->u.opline_num].result TSRMLS_CC);
                } else {
                        zend_do_assign_ref(NULL, value, &result_value TSRMLS_CC);
                }
@@ -3491,21 +3489,19 @@ void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znod
 }
 
 
-void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token, znode *cont_token TSRMLS_DC)
+void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token TSRMLS_DC)
 {
        zend_op *container_ptr;
        zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
        opline->opcode = ZEND_JMP;
-       opline->op1.u.opline_num = cont_token->u.opline_num;
+       opline->op1.u.opline_num = foreach_token->u.opline_num;
        SET_UNUSED(opline->op1);
        SET_UNUSED(opline->op2);
 
        CG(active_op_array)->opcodes[foreach_token->u.opline_num].op2.u.opline_num = get_next_op_number(CG(active_op_array));
-       CG(active_op_array)->opcodes[foreach_token->u.opline_num+1].op2.u.opline_num = cont_token->u.opline_num;
-       CG(active_op_array)->opcodes[cont_token->u.opline_num].op2.u.opline_num = get_next_op_number(CG(active_op_array));
 
-       do_end_loop(cont_token->u.opline_num TSRMLS_CC);
+       do_end_loop(foreach_token->u.opline_num TSRMLS_CC);
 
        zend_stack_top(&CG(foreach_copy_stack), (void **) &container_ptr);
        generate_free_foreach_copy(container_ptr TSRMLS_CC);

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 0b8c0cfaa6642e835b398a95de0cc02814d96923..825ffca75899bdb23b45d176ed3055c525248c72 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -461,9 +461,9 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC
 
 void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC);
 
-void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, int variable TSRMLS_DC);
-void zend_do_foreach_cont(znode *foreach_token, znode *open_brackets_token, znode *as_token, znode *value, znode *key, znode *cont_token TSRMLS_DC);
-void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token, znode *cont_token TSRMLS_DC);
+void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable TSRMLS_DC);
+void zend_do_foreach_cont(znode *value, znode *key, znode *as_token, znode *foreach_token TSRMLS_DC);
+void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token TSRMLS_DC);
 
 void zend_do_declare_begin(TSRMLS_D);
 void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC);

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 8ccbc6dca9b5c493992ce54afb836dd7ace6d60b..7dd066fb0afd7935ec79bc19f8bf74d4d5518ba6 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -209,14 +209,8 @@ unticked_statement:
        |       expr ';'                                { zend_do_free(&$1 TSRMLS_CC); }
        |       T_USE use_filename ';'          { zend_error(E_COMPILE_ERROR,"use: Not yet supported. Please use include_once() or require_once()");  zval_dtor(&$2.u.constant); }
        |       T_UNSET '(' unset_variables ')' ';'
-       |       T_FOREACH '(' variable T_AS foreach_variable foreach_optional_arg 
-               { zend_do_foreach_begin(&$1, &$2, &$3, 1 TSRMLS_CC); }
-               ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$5, &$6, &$8 TSRMLS_CC); }
-               foreach_statement { zend_do_foreach_end(&$1, &$2, &$8 TSRMLS_CC); }
-       |       T_FOREACH '(' expr_without_variable T_AS w_variable foreach_optional_arg 
-               { zend_do_foreach_begin(&$1, &$2, &$3, 0 TSRMLS_CC); }
-               ')' { zend_do_foreach_cont(&$1, &$2, &$4, &$5, &$6, &$8 TSRMLS_CC); }
-               foreach_statement { zend_do_foreach_end(&$1, &$2, &$8 TSRMLS_CC); }
+       |       T_FOREACH '(' variable T_AS { zend_do_foreach_begin(&$1, &$3, &$2, &$4, 1 TSRMLS_CC); } foreach_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$6, &$7, &$4, &$1 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$2 TSRMLS_CC); }
+       |       T_FOREACH '(' expr_without_variable T_AS { zend_do_foreach_begin(&$1, &$3, &$2, &$4, 0 TSRMLS_CC); } w_variable foreach_optional_arg ')' { zend_do_foreach_cont(&$6, &$7, &$4, &$1 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$2 TSRMLS_CC); }
        |       T_DECLARE { $1.u.opline_num = get_next_op_number(CG(active_op_array)); zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(&$1 TSRMLS_CC); }
        |       ';'             /* empty statement */
        |       T_TRY { zend_do_try(&$1 TSRMLS_CC); } '{' inner_statement_list '}'