aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog6
-rw-r--r--gcc/c-family/c-common.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/parse/error58.C7
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index d6e1b8b..547edad 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-12 Marek Polacek <polacek@redhat.com>
+
+ PR c++/78647
+ * c-common.c (attribute_fallthrough_p): Return false for
+ error_mark_node.
+
2016-12-08 Martin Sebor <msebor@redhat.com>
PR c/78284
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 0749361..c8e1f0d 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -5558,6 +5558,8 @@ parse_optimize_options (tree args, bool attr_p)
bool
attribute_fallthrough_p (tree attr)
{
+ if (attr == error_mark_node)
+ return false;
tree t = lookup_attribute ("fallthrough", attr);
if (t == NULL_TREE)
return false;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1f5184..d6657b5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-12 Marek Polacek <polacek@redhat.com>
+
+ PR c++/78647
+ * g++.dg/parse/error58.C: New.
+
2016-12-12 David Malcolm <dmalcolm@redhat.com>
PR preprocessor/78680
diff --git a/gcc/testsuite/g++.dg/parse/error58.C b/gcc/testsuite/g++.dg/parse/error58.C
new file mode 100644
index 0000000..5ed6e1e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/error58.C
@@ -0,0 +1,7 @@
+// PR c++/78647
+// { dg-do compile { target c++11 } }
+// { dg-options "-w" }
+
+struct A;
+void foo ();
+void f() { alignas (foo (A)); } // { dg-error "expected" "" }