From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 18 Mar 2016 08:25:57 +0000 (+0000)
Subject: 	* reload1.c (emit_input_reload_insns): Use simplify_replace_rtx
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5abd7d4aa5073d9004c12f6e1ea3856c27e6c501;p=thirdparty%2Fgcc.git

	* reload1.c (emit_input_reload_insns): Use simplify_replace_rtx
	instead of replace_rtx for DEBUG_INSNs.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234320 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 115d77871a64..9604293777c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* reload1.c (emit_input_reload_insns): Use simplify_replace_rtx
+	instead of replace_rtx for DEBUG_INSNs.
+
 2016-03-18  Venkataramanan Kumar  <venkataramanan.kumar@amd.com>
 
 	* config/i386/znver1.md : Fix latencies of FP/SSE/AVX
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 252394e07770..c2800f8cb790 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -7395,7 +7395,9 @@ emit_input_reload_insns (struct insn_chain *chain, struct reload *rl,
 	      /* Adjust any debug insns between temp and insn.  */
 	      while ((temp = NEXT_INSN (temp)) != insn)
 		if (DEBUG_INSN_P (temp))
-		  replace_rtx (PATTERN (temp), old, reloadreg);
+		  INSN_VAR_LOCATION_LOC (temp)
+		    = simplify_replace_rtx (INSN_VAR_LOCATION_LOC (temp),
+					    old, reloadreg);
 		else
 		  gcc_assert (NOTE_P (temp));
 	    }