expr.c (expand_expr_real_1): Change to not using input_location.

2012-11-01  Dehao Chen  <dehao@google.com>

	* expr.c (expand_expr_real_1): Change to not using input_location.

From-SVN: r193137

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6367ac578de0559dcaeb2844c79fcde805e30f46..6725b563c4d74d92d92576b2a2fd2302a3bc48d0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-04  Dehao Chen  <dehao@google.com>
+
+       * expr.c (expand_expr_real_1): Change to not using input_location.
+
 2012-11-03  Jan Hubicka  <jh@suse.cz>
 
        * invoke.texi (profile-use): update documentation.

diff --git a/gcc/expr.c b/gcc/expr.c
index 0ad3b578f17529bc0b2f3db3e1b21b20c671a712..57e71fbaca3eb837d53b0e9932c9ed86008a37d4 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -9221,13 +9221,11 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
       if (g)
        {
          rtx r;
-         location_t saved_loc = input_location;
+         location_t saved_loc = curr_insn_location ();
 
-         input_location = gimple_location (g);
-         set_curr_insn_location (input_location);
+         set_curr_insn_location (gimple_location (g));
          r = expand_expr_real (gimple_assign_rhs_to_tree (g), target,
                                tmode, modifier, NULL);
-         input_location = saved_loc;
          set_curr_insn_location (saved_loc);
          if (REG_P (r) && !REG_EXPR (r))
            set_reg_attrs_for_decl_rtl (SSA_NAME_VAR (exp), r);