From: Dehao Chen Date: Sun, 4 Nov 2012 17:18:19 +0000 (+0000) Subject: expr.c (expand_expr_real_1): Change to not using input_location. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=48e3b832bd1f56a8a3b10df5aada6eec28ca14c1;p=gcc.git expr.c (expand_expr_real_1): Change to not using input_location. 2012-11-01 Dehao Chen * expr.c (expand_expr_real_1): Change to not using input_location. From-SVN: r193137 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6367ac578de..6725b563c4d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-11-04 Dehao Chen + + * expr.c (expand_expr_real_1): Change to not using input_location. + 2012-11-03 Jan Hubicka * invoke.texi (profile-use): update documentation. diff --git a/gcc/expr.c b/gcc/expr.c index 0ad3b578f17..57e71fbaca3 100644 --- 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);