OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

call.c (build_conditional_expr): Don't assume that the folded expression has result_type. 

* call.c (build_conditional_expr): Don't assume that the folded
        expression has result_type.

From-SVN: r66561
This commit is contained in:
Jason Merrill 2003-05-07 11:00:10 -04:00 committed by Jason Merrill
parent ffea5d1e43
commit a65fd2d71b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2003-05-07 Jason Merrill <jason@redhat.com>
* call.c (build_conditional_expr): Don't assume that the folded
expression has result_type.
2003-05-06 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* typeck.c (build_unary_op): Deal with const qualifier in

9
gcc/cp/call.c
View File

@ -3530,16 +3530,19 @@ build_conditional_expr (tree arg1, tree arg2, tree arg3)
valid_operands:
result = fold (build (COND_EXPR, result_type, arg1, arg2, arg3));
/* We can't use result_type below, as fold might have returned a
throw_expr. */
/* Expand both sides into the same slot, hopefully the target of the
?: expression. We used to check for TARGET_EXPRs here, but now we
sometimes wrap them in NOP_EXPRs so the test would fail. */
if (!lvalue_p && IS_AGGR_TYPE (result_type))
result = build_target_expr_with_type (result, result_type);
if (!lvalue_p && IS_AGGR_TYPE (TREE_TYPE (result)))
result = get_target_expr (result);
/* If this expression is an rvalue, but might be mistaken for an
lvalue, we must add a NON_LVALUE_EXPR. */
if (!lvalue_p && real_lvalue_p (result))
result = build1 (NON_LVALUE_EXPR, result_type, result);
result = build1 (NON_LVALUE_EXPR, TREE_TYPE (result), result);
return result;
}