* ada-lang.c (ada_evaluate_subexp) [BINOP_ASSIGN]: Do not force

the type of the right hand side of the assignment to the type
        of the left hand side if the left hand side is a convenience
        variable.
This commit is contained in:
Joel Brobecker 2008-05-09 23:50:41 +00:00
parent 35903be00c
commit 003f381353
2 changed files with 15 additions and 1 deletions

View file

@ -8558,7 +8558,14 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
return arg1;
return ada_value_assign (arg1, arg1);
}
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
/* Force the evaluation of the rhs ARG2 to the type of the lhs ARG1,
except if the lhs of our assignment is a convenience variable.
In the case of assigning to a convenience variable, the lhs
should be exactly the result of the evaluation of the rhs. */
type = value_type (arg1);
if (VALUE_LVAL (arg1) == lval_internalvar)
type = NULL;
arg2 = evaluate_subexp (type, exp, pos, noside);
if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
return arg1;
if (ada_is_fixed_point_type (value_type (arg1)))