diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/gimplify.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5907bf2..ad53fe1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2011-07-18 Richard Guenther <rguenther@suse.de> + * gimplify.c (gimplify_expr): Use input_location, not saved_location + when building new trees. + +2011-07-18 Richard Guenther <rguenther@suse.de> + * expr.c (expand_expr_real_2): Properly truncate the BIT_NOT_EXPR expansion result to bitfield precision if required. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index f313352..d1ce6d3 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -6773,13 +6773,13 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, source location of the outer expression. */ tree org_type = TREE_TYPE (*expr_p); *expr_p = gimple_boolify (*expr_p); - *expr_p = build3_loc (saved_location, COND_EXPR, + *expr_p = build3_loc (input_location, COND_EXPR, org_type, *expr_p, fold_convert_loc - (saved_location, + (input_location, org_type, boolean_true_node), fold_convert_loc - (saved_location, + (input_location, org_type, boolean_false_node)); ret = GS_OK; break; @@ -7229,7 +7229,7 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, *expr_p = gimple_boolify (*expr_p); if (!useless_type_conversion_p (orig_type, TREE_TYPE (*expr_p))) { - *expr_p = fold_convert_loc (saved_location, orig_type, *expr_p); + *expr_p = fold_convert_loc (input_location, orig_type, *expr_p); ret = GS_OK; break; } |