From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 11 May 2015 22:12:46 +0000 (+0000)
Subject: emit-rtl.c (emit_pattern_after_setloc): Add missing guard.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=20d4397af8a085a17925d3a3a3545748d5ab7fc6;p=gcc.git

emit-rtl.c (emit_pattern_after_setloc): Add missing guard.

	* emit-rtl.c (emit_pattern_after_setloc): Add missing guard.
	(emit_pattern_before_setloc): Likewise.

From-SVN: r223020
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 610389faebd..ed176bdc256 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* emit-rtl.c (emit_pattern_after_setloc): Add missing guard.
+	(emit_pattern_before_setloc): Likewise.
+
 2015-05-11  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* genrecog.c (match_pattern_1): Expect the pattern to be a SEQUENCE
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index d5e09c26f04..4d332365598 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4676,7 +4676,9 @@ emit_pattern_after_setloc (rtx pattern, rtx uncast_after, int loc,
   after = NEXT_INSN (after);
   while (1)
     {
-      if (active_insn_p (after) && !INSN_LOCATION (after))
+      if (active_insn_p (after)
+	  && !JUMP_TABLE_DATA_P (after) /* FIXME */
+	  && !INSN_LOCATION (after))
 	INSN_LOCATION (after) = loc;
       if (after == last)
 	break;
@@ -4787,7 +4789,9 @@ emit_pattern_before_setloc (rtx pattern, rtx uncast_before, int loc, bool insnp,
     first = NEXT_INSN (first);
   while (1)
     {
-      if (active_insn_p (first) && !INSN_LOCATION (first))
+      if (active_insn_p (first)
+	  && !JUMP_TABLE_DATA_P (first) /* FIXME */
+	  && !INSN_LOCATION (first))
 	INSN_LOCATION (first) = loc;
       if (first == last)
 	break;