ipa-prop.c (ipa_modify_call_arguments): Set loc correctly.

2010-11-27 Dehao Chen <[email protected]> * ipa-prop.c (ipa_modify_call_arguments): Set loc correctly. * emit-rtl.c (last_location): Remove unused variable. From-SVN: r193857
R-macos · Nov 27, 2012 · 3a50da3 · 3a50da3
1 parent a7538b9
commit 3a50da3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-27  Dehao Chen  <[email protected]>
+
+	* ipa-prop.c (ipa_modify_call_arguments): Set loc correctly.
+	* emit-rtl.c (last_location): Remove unused variable.
+
 2012-11-27  Uros Bizjak  <[email protected]>
 
 	* config/i386/i386.md

diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
@@ -5954,15 +5954,14 @@ location_t epilogue_location;
 /* Hold current location information and last location information, so the
    datastructures are built lazily only when some instructions in given
    place are needed.  */
-static location_t curr_location, last_location;
+static location_t curr_location;
 
 /* Allocate insn location datastructure.  */
 void
 insn_locations_init (void)
 {
   prologue_location = epilogue_location = 0;
   curr_location = UNKNOWN_LOCATION;
-  last_location = UNKNOWN_LOCATION;
 }
 
 /* At the end of emit stage, clear current location.  */

diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
@@ -2910,7 +2910,8 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt,
 
 	  gcc_checking_assert (adj->offset % BITS_PER_UNIT == 0);
 	  base = gimple_call_arg (stmt, adj->base_index);
-	  loc = EXPR_LOCATION (base);
+	  loc = DECL_P (base) ? DECL_SOURCE_LOCATION (base)
+			      : EXPR_LOCATION (base);
 
 	  if (TREE_CODE (base) != ADDR_EXPR
 	      && POINTER_TYPE_P (TREE_TYPE (base)))