aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2018-03-28 05:04:59 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2018-03-28 05:04:59 +0000
commit04acc378eb62c937576065668df01a23fa1b0680 (patch)
tree9e4b8e9b591e3fc6fa33009cf0b2beb51acb5653 /gcc
parentd80bb039e612192f7eab8fec30f6b6239f4539a3 (diff)
downloadgcc-04acc378eb62c937576065668df01a23fa1b0680.zip
gcc-04acc378eb62c937576065668df01a23fa1b0680.tar.gz
gcc-04acc378eb62c937576065668df01a23fa1b0680.tar.bz2
[PR c++/84968] reject stmt-exprs in noexcept constexprs
We reject extended statement-expressions in template parameters, so we might as well reject them in constant expressions used in noexcept specifications. for gcc/cp/ChangeLog PR c++/84968 * tree.c (strip_typedefs_expr): Reject STATEMENT_LISTs. for gcc/testsuite/ChangeLog PR c++/84968 * g++.dg/eh/pr84968.C: New. From-SVN: r258913
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/tree.c4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/eh/pr84968.C15
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4c02981..23f5d3a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-28 Alexandre Oliva <aoliva@redhat.com>
+
+ PR c++/84968
+ * tree.c (strip_typedefs_expr): Reject STATEMENT_LISTs.
+
2018-03-27 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/85067
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0355b9e..e75c88d 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1788,6 +1788,10 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
error ("lambda-expression in a constant expression");
return error_mark_node;
+ case STATEMENT_LIST:
+ error ("statement-expression in a constant expression");
+ return error_mark_node;
+
default:
break;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b195bd7..929d4dd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-28 Alexandre Oliva <aoliva@redhat.com>
+
+ PR c++/84968
+ * g++.dg/eh/pr84968.C: New.
+
2018-03-27 Michael Meissner <meissner@linux.vnet.ibm.com>
PR target/84914
diff --git a/gcc/testsuite/g++.dg/eh/pr84968.C b/gcc/testsuite/g++.dg/eh/pr84968.C
new file mode 100644
index 0000000..23c49f4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/pr84968.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target c++11 } }
+
+// { dg-options "" }
+
+union b;
+
+struct S {
+ template <typename>
+ void a()
+ try {
+ } catch (int ()
+ noexcept (({ union b a; true; }))) // { dg-error "constant" }
+ {
+ }
+};