From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 14 Dec 2017 15:06:25 +0000 (+0000)
Subject: re PR bootstrap/83396 (Bootstrap failures with Statement Frontiers)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bb00f5e7b63831af544e928c51ca049ddc4ac6f0;p=gcc.git

re PR bootstrap/83396 (Bootstrap failures with Statement Frontiers)

	PR bootstrap/83396
	* reload1.c (emit_input_reload_insns): Skip debug markers.

From-SVN: r255640
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5805e116ff5..b7c76314d18 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+	PR bootstrap/83396
+	* reload1.c (emit_input_reload_insns): Skip debug markers.
+
 2017-12-14  Alexandre Oliva <aoliva@redhat.com>
 
 	* config/i386/i386.c (rest_of_insert_endbranch): Use call loc
diff --git a/gcc/reload1.c b/gcc/reload1.c
index fe1ec0d011f..baedc43b75f 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -7345,12 +7345,12 @@ 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))
+		if (DEBUG_BIND_INSN_P (temp))
 		  INSN_VAR_LOCATION_LOC (temp)
 		    = simplify_replace_rtx (INSN_VAR_LOCATION_LOC (temp),
 					    old, reloadreg);
 		else
-		  gcc_assert (NOTE_P (temp));
+		  gcc_assert (DEBUG_INSN_P (temp) || NOTE_P (temp));
 	    }
 	  else
 	    {