From 20d4397af8a085a17925d3a3a3545748d5ab7fc6 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 11 May 2015 22:12:46 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 5 +++++ gcc/emit-rtl.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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 + + * emit-rtl.c (emit_pattern_after_setloc): Add missing guard. + (emit_pattern_before_setloc): Likewise. + 2015-05-11 Richard Sandiford * 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; -- 2.30.2