Use copy_triple only on non-flattened nodes.
authorPatrick Georgi <patrick.georgi@coresystems.de>
Mon, 15 Mar 2010 10:32:59 +0000 (10:32 +0000)
committerPatrick Georgi <patrick.georgi@coresystems.de>
Mon, 15 Mar 2010 10:32:59 +0000 (10:32 +0000)
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5212 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

util/romcc/romcc.c

index 5fa7ede182027dc3a4a2e9f8ca8414c152af5e40..b6f68409be2b6fb4ca2fce029ae0fff8bce51db4 100644 (file)
@@ -11557,7 +11557,7 @@ static struct triple *constant_expr(struct compile_state *state)
 
 static struct triple *assignment_expr(struct compile_state *state)
 {
-       struct triple *def, *left, *right;
+       struct triple *def, *left, *left2, *right;
        int tok, op, sign;
        /* The C grammer in K&R shows assignment expressions
         * only taking unary expressions as input on their
@@ -11578,6 +11578,9 @@ static struct triple *assignment_expr(struct compile_state *state)
         */
        def = conditional_expr(state);
        left = def;
+       left2 = left;
+       if (!(left2->id & TRIPLE_FLAG_FLATTENED))
+               left2 = copy_triple(state, left2);
        switch((tok = peek(state))) {
        case TOK_EQ:
                lvalue(state, left);
@@ -11603,19 +11606,19 @@ static struct triple *assignment_expr(struct compile_state *state)
                }
                def = write_expr(state, left,
                        triple(state, op, left->type, 
-                               read_expr(state, copy_triple(state, left)), right));
+                               read_expr(state, left2), right));
                break;
        case TOK_PLUSEQ:
                lvalue(state, left);
                eat(state, TOK_PLUSEQ);
                def = write_expr(state, left,
-                       mk_add_expr(state, copy_triple(state, left), assignment_expr(state)));
+                       mk_add_expr(state, left2, assignment_expr(state)));
                break;
        case TOK_MINUSEQ:
                lvalue(state, left);
                eat(state, TOK_MINUSEQ);
                def = write_expr(state, left,
-                       mk_sub_expr(state, copy_triple(state, left), assignment_expr(state)));
+                       mk_sub_expr(state, left2, assignment_expr(state)));
                break;
        case TOK_SLEQ:
        case TOK_SREQ:
@@ -11639,7 +11642,7 @@ static struct triple *assignment_expr(struct compile_state *state)
                }
                def = write_expr(state, left,
                        triple(state, op, left->type, 
-                               read_expr(state, copy_triple(state,left)), right));
+                               read_expr(state, left2), right));
                break;
        }
        return def;