aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2024-06-25 20:07:15 -0400
committerPatrick Palka <ppalka@redhat.com>2024-06-25 20:07:15 -0400
commit737449e5f233feb682b5dd2cc153892ad90a79bd (patch)
treeae0837172adba2c96f72f7b7f10fedc4d882b54a
parent3e64a687a303dd550df072676c853d79076de37f (diff)
c++: decltype of capture proxy of ref [PR115504]
The finish_decltype_type capture proxy handling added in r14-5330 was incorrectly stripping references in the type of the captured variable. PR c++/115504 gcc/cp/ChangeLog: * semantics.cc (finish_decltype_type): Don't strip the reference type (if any) of a capture proxy's captured variable. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/decltype-auto8.C: New test. Reviewed-by: Jason Merrill <jason@redhat.com>
-rw-r--r--gcc/cp/semantics.cc1
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/decltype-auto8.C22
2 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 8e3e4e23b72..44de4c9a529 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -12071,7 +12071,6 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p,
{
expr = DECL_CAPTURED_VARIABLE (expr);
type = TREE_TYPE (expr);
- type = non_reference (type);
}
else
{
diff --git a/gcc/testsuite/g++.dg/cpp1y/decltype-auto8.C b/gcc/testsuite/g++.dg/cpp1y/decltype-auto8.C
new file mode 100644
index 00000000000..55135cecf72
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/decltype-auto8.C
@@ -0,0 +1,22 @@
+// PR c++/115504
+// { dg-do compile { target c++14 } }
+
+void f(int& x, const int& y) {
+ [&x]() {
+ decltype(auto) a = x;
+ using type = decltype(x);
+ using type = decltype(a);
+ using type = int&; // not 'int'
+ };
+
+ [x]() {
+ decltype(auto) a = x; // { dg-error "discards qualifiers" }
+ };
+
+ [x]() mutable {
+ decltype(auto) a = x;
+ using type = decltype(x);
+ using type = decltype(a);
+ using type = int&;
+ };
+}