Use copy_triple only on non-flattened nodes.

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
This commit is contained in:
Patrick Georgi
2010-03-15 10:32:59 +00:00
parent 3b8d6a866d
commit 8f4546f7ca

View File

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