aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2020-05-15 18:51:11 -0400
committerPatrick Palka <ppalka@redhat.com>2020-05-15 18:51:11 -0400
commit115232b778943be075fc4df991e03d9387563114 (patch)
treef9efb9c61ff16ac50f01e0f92a1eda1adac2a6b9
parent9d495e725084b5464b17911a11fddfda3a3d906f (diff)
downloadgcc-115232b778943be075fc4df991e03d9387563114.zip
gcc-115232b778943be075fc4df991e03d9387563114.tar.gz
gcc-115232b778943be075fc4df991e03d9387563114.tar.bz2
c++: decltype of invalid non-dependent expr [PR57943]
We sometimes fail to reject an invalid non-dependent operand to decltype when inside a template, because finish_decltype_type resolves the decltype to the TREE_TYPE of the operand before we ever instantiate and fully process the operand. Fix this by adding a call to instantiate_non_dependent_expr_sfinae in finish_decltype_type. gcc/cp/ChangeLog: PR c++/57943 * semantics.c (finish_decltype_type): Call instantiate_non_dependent_expr_sfinae on the expression. gcc/testsuite/ChangeLog: PR c++/57943 * g++.dg/cpp0x/decltype76.C: New test.
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/semantics.c8
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/decltype76.C7
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index acd2d7b..4b9fc52 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-16 Patrick Palka <ppalka@redhat.com>
+
+ PR c++/57943
+ * semantics.c (finish_decltype_type): Call
+ instantiate_non_dependent_expr_sfinae on the expression.
+
2020-05-15 Patrick Palka <ppalka@redhat.com>
Revert:
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index d90816e..64587c7 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -9746,6 +9746,14 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p,
return type;
}
+ else if (processing_template_decl)
+ {
+ ++cp_unevaluated_operand;
+ expr = instantiate_non_dependent_expr_sfinae (expr, complain);
+ --cp_unevaluated_operand;
+ if (expr == error_mark_node)
+ return error_mark_node;
+ }
/* The type denoted by decltype(e) is defined as follows: */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 875ac82..a7f7771 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-16 Patrick Palka <ppalka@redhat.com>
+
+ PR c++/57943
+ * g++.dg/cpp0x/decltype76.C: New test.
+
2020-05-15 Jason Merrill <jason@redhat.com>
* g++.dg/coroutines/coro.h: Always #include <utility>.
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype76.C b/gcc/testsuite/g++.dg/cpp0x/decltype76.C
new file mode 100644
index 0000000..239fe6d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype76.C
@@ -0,0 +1,7 @@
+// PR c+/57943
+// { dg-do compile { target c++11 } }
+
+struct a { };
+
+template <typename T = decltype (a(0))> // { dg-error "" }
+void f() { }