summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>2017-02-22 19:33:13 +0000
committermpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>2017-02-22 19:33:13 +0000
commit2c2c15041c50d59243117ef075380bcc3a4f50ae (patch)
treee4546c23062b46f30ef92c2f21ece5424f972c95
parentaba254d025f229a70fd96429adc6c88cf0a4a005 (diff)
downloadgcc-2c2c15041c50d59243117ef075380bcc3a4f50ae.tar.gz
PR c++/79657
* semantics.c (finish_underlying_type): Bail out for incomplete enums. * g++.dg/ext/underlying_type12.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@245658 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/semantics.c3
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/ext/underlying_type12.C6
4 files changed, 14 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 38b60bc695f..c036f8cf0e0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -6,6 +6,9 @@
* pt.c (tsubst_attribute): If tsubst_pack_expansion fails, return
error_mark_node.
+ PR c++/79657
+ * semantics.c (finish_underlying_type): Bail out for incomplete enums.
+
2017-02-21 Jason Merrill <jason@redhat.com>
PR c++/50308 - wrong deprecated warning with ADL
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 6ba7c13d6ec..67f8b9264f1 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3838,7 +3838,8 @@ finish_underlying_type (tree type)
return underlying_type;
}
- complete_type (type);
+ if (!complete_type_or_else (type, NULL_TREE))
+ return error_mark_node;
if (TREE_CODE (type) != ENUMERAL_TYPE)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 628529b535c..31e7b4fb79e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -4,6 +4,9 @@
* g++.dg/cpp0x/alignas10.C: New test.
* g++.dg/cpp0x/alignas9.C: New test.
+ PR c++/79657
+ * g++.dg/ext/underlying_type12.C: New test.
+
2017-02-22 Jakub Jelinek <jakub@redhat.com>
PR target/70465
diff --git a/gcc/testsuite/g++.dg/ext/underlying_type12.C b/gcc/testsuite/g++.dg/ext/underlying_type12.C
new file mode 100644
index 00000000000..050ecf270b8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/underlying_type12.C
@@ -0,0 +1,6 @@
+// PR c++/79657
+// { dg-do compile { target c++11 } }
+
+enum A { x };
+enum B { a = (__underlying_type (A)) 1 };
+enum C { b = (__underlying_type (C)) 1 }; // { dg-error "incomplete" }