From 3add6b9ceefe37faac82e2d24b11c6f45e630877 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 5 Feb 2024 13:54:22 -0500 Subject: [PATCH] c++: prvalue of array type [PR111286] Here we want to build a prvalue array to bind to the T reference, but we were wrongly trying to strip cv-quals from the array prvalue, which should be treated the same as a class prvalue. PR c++/111286 gcc/cp/ChangeLog: * tree.cc (rvalue): Don't drop cv-quals from an array. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/initlist-array22.C: New test. (cherry picked from commit c7e8381748f78335e9fef23f363b6a9e4463ce7e) --- gcc/cp/tree.cc | 9 +++++---- gcc/testsuite/g++.dg/cpp0x/initlist-array22.C | 12 ++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-array22.C diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index a7933ad2c2f8..01476fe92bec 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -970,11 +970,12 @@ rvalue (tree expr) expr = mark_rvalue_use (expr); - /* [basic.lval] - - Non-class rvalues always have cv-unqualified types. */ + /* [expr.type]: "If a prvalue initially has the type "cv T", where T is a + cv-unqualified non-class, non-array type, the type of the expression is + adjusted to T prior to any further analysis. */ type = TREE_TYPE (expr); - if (!CLASS_TYPE_P (type) && cv_qualified_p (type)) + if (!CLASS_TYPE_P (type) && TREE_CODE (type) != ARRAY_TYPE + && cv_qualified_p (type)) type = cv_unqualified (type); /* We need to do this for rvalue refs as well to get the right answer diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array22.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array22.C new file mode 100644 index 000000000000..8629e4be239e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array22.C @@ -0,0 +1,12 @@ +// PR c++/111286 +// { dg-do compile { target c++11 } } +// { dg-additional-options -Wno-unused } + +struct A { + A() noexcept {} +}; + +void foo() { + using T = const A (&)[1]; + T{}; +} -- 2.47.2