gimplify.c (gimplify_expr): Use input_location, not saved_location when building...

2011-07-18  Richard Guenther  <rguenther@suse.de>

	* gimplify.c (gimplify_expr): Use input_location, not saved_location
	when building new trees.

From-SVN: r176400

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5907bf25892e20a8094b52ba2d73034eed084f39..ad53fe14ec7d7edb8fead518f4b5808ab43da553 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index f313352e8a237358e3729394ebf074214fa9d466..d1ce6d3dce83f5a1b74b4fc6ca02deacc65971ae 100644 (file)
--- 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;
              }