aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/sh/sh.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53be213..64405b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-15 Kaz Kojima <kkojima@gcc.gnu.org>
+
+ * config/sh/sh.c (barrier_align): Return 0 when barrier_or_label
+ is null.
+
2013-11-15 Aldy Hernandez <aldyh@redhat.com>
* Makefile.in (C_COMMON_OBJS): Depend on c-cilkplus.o.
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index b812b8c..088ef39 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -5777,6 +5777,9 @@ barrier_align (rtx barrier_or_label)
{
rtx next, pat;
+ if (! barrier_or_label)
+ return 0;
+
if (LABEL_P (barrier_or_label)
&& NEXT_INSN (barrier_or_label)
&& JUMP_TABLE_DATA_P (NEXT_INSN (barrier_or_label)))