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

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

From-SVN: r234320

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 115d77871a6424717765bfddbb84964926304dc4..9604293777c34aa8b3dc449d34e1b19736e341d4 100644 (file)
--- 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 252394e07770700aa0d567ca4670403561cf6c35..c2800f8cb790ed221123c64c6697166d93dc7984 100644 (file)
--- 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));
            }