diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2015-05-11 22:12:46 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2015-05-11 22:12:46 +0000 |
| commit | 20d4397af8a085a17925d3a3a3545748d5ab7fc6 (patch) | |
| tree | 155e53f4881ae07a5cb50ac7bc1513e1bdefd404 /gcc | |
| parent | 21cd397ea325b16e0cf493552dd6e44d06082f45 (diff) | |
| download | gcc-20d4397af8a085a17925d3a3a3545748d5ab7fc6.zip gcc-20d4397af8a085a17925d3a3a3545748d5ab7fc6.tar.gz gcc-20d4397af8a085a17925d3a3a3545748d5ab7fc6.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/emit-rtl.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 610389f..ed176bd 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 d5e09c2..4d33236 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; |