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

2010-11-27  Dehao Chen  <dehao@google.com>

	* ipa-prop.c (ipa_modify_call_arguments): Set loc correctly.
	* emit-rtl.c (last_location): Remove unused variable.

From-SVN: r193857

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9cecb38abd3869d6c7ffbb1fad845bd2ea06ebcb..7ae020a9dba8a648eb35134b98976b4fc30cf879 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-27  Dehao Chen  <dehao@google.com>
+
+       * ipa-prop.c (ipa_modify_call_arguments): Set loc correctly.
+       * emit-rtl.c (last_location): Remove unused variable.
+
 2012-11-27  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.md

diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index a15be5194b381c1b6ffa49ddf51cd61a597d6b1b..08c4b60683b843eec4f57da15ad661c76c529f8c 100644 (file)
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -5954,7 +5954,7 @@ 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
@@ -5962,7 +5962,6 @@ 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
index b7da25440449eac4d0c66465a310f523144d3586..6016257369f599f1deec78742818f6a722a4bd49 100644 (file)
--- 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)))