From: Renlin Li <renlin.li@arm.com>
Date: Fri, 6 Feb 2015 14:37:59 +0000 (+0000)
Subject: [PATCH]Keep location info when expand complex component-wise load/store.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f376994ad8101fe7819c52e6c44f8a51134dd48f;p=gcc.git

[PATCH]Keep location info when expand complex component-wise load/store.

gcc/
	* tree-ssa-forwprop.c (execute): Keep location info while rewrite
	complex gimple.
	* tree-ssa.c (execute_update_addresses_taken): Likewise.

From-SVN: r220480
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41a824d057b..47d98adbd5c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-06  Renlin Li  <renlin.li@arm.com>
+
+	* tree-ssa-forwprop.c (execute): Keep location info while rewrite
+	complex gimple.
+	* tree-ssa.c (execute_update_addresses_taken): Likewise.
+
 2015-02-06  Jeff Law  <law@redhat.com>
 
 	PR target/64889
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 82d832d4754..d8db20acd3c 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -2274,6 +2274,8 @@ pass_forwprop::execute (function *fun)
 			= gimple_build_assign (gimple_assign_lhs (use_stmt),
 					       new_rhs);
 
+		      location_t loc = gimple_location (use_stmt);
+		      gimple_set_location (new_stmt, loc);
 		      gimple_stmt_iterator gsi2 = gsi_for_stmt (use_stmt);
 		      unlink_stmt_vdef (use_stmt);
 		      gsi_remove (&gsi2, true);
@@ -2305,6 +2307,8 @@ pass_forwprop::execute (function *fun)
 					 TREE_TYPE (TREE_TYPE (use_lhs)),
 					 unshare_expr (use_lhs));
 		  gimple new_stmt = gimple_build_assign (new_lhs, rhs);
+		  location_t loc = gimple_location (use_stmt);
+		  gimple_set_location (new_stmt, loc);
 		  gimple_set_vuse (new_stmt, gimple_vuse (use_stmt));
 		  gimple_set_vdef (new_stmt, make_ssa_name (gimple_vop (cfun)));
 		  SSA_NAME_DEF_STMT (gimple_vdef (new_stmt)) = new_stmt;
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 5bf64476beb..10d3314558e 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -1561,6 +1561,8 @@ execute_update_addresses_taken (void)
 					TREE_TYPE (other),
 					TREE_OPERAND (lhs, 0));
 		    gimple load = gimple_build_assign (other, lrhs);
+		    location_t loc = gimple_location (stmt);
+		    gimple_set_location (load, loc);
 		    gimple_set_vuse (load, gimple_vuse (stmt));
 		    gsi_insert_before (&gsi, load, GSI_SAME_STMT);
 		    gimple_assign_set_lhs (stmt, TREE_OPERAND (lhs, 0));