public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-8235] c++: address of class NTTP object as targ [PR113242]
@ 2024-01-18 15:53 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2024-01-18 15:53 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:4ffb23975b32bfd285915c3d6659b837868b5aa9
commit r13-8235-g4ffb23975b32bfd285915c3d6659b837868b5aa9
Author: Patrick Palka <ppalka@redhat.com>
Date: Wed Jan 17 13:01:01 2024 -0500
c++: address of class NTTP object as targ [PR113242]
invalid_tparm_referent_p was rejecting using the address of a class NTTP
object as a template argument, but this should be fine.
PR c++/113242
PR c++/99493
gcc/cp/ChangeLog:
* pt.cc (invalid_tparm_referent_p) <case ADDR_EXPR>: Suppress
DECL_ARTIFICIAL rejection test for class NTTP objects.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/nontype-class61.C: New test.
* g++.dg/cpp2a/nontype-class62.C: New test.
Reviewed-by: Jason Merrill <jason@redhat.com>
(cherry picked from commit 68cea2d32a9fd525154b6a48042e5835d4c5e371)
Diff:
---
gcc/cp/pt.cc | 4 +++-
gcc/testsuite/g++.dg/cpp2a/nontype-class61.C | 25 +++++++++++++++++++++++++
gcc/testsuite/g++.dg/cpp2a/nontype-class62.C | 8 ++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index c04dd8f8fbd..3214ce8df49 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -7180,8 +7180,10 @@ invalid_tparm_referent_p (tree type, tree expr, tsubst_flags_t complain)
* a string literal (5.13.5),
* the result of a typeid expression (8.2.8), or
* a predefined __func__ variable (11.4.1). */
- else if (VAR_P (decl) && DECL_ARTIFICIAL (decl))
+ else if (VAR_P (decl) && DECL_ARTIFICIAL (decl)
+ && !DECL_NTTP_OBJECT_P (decl))
{
+ gcc_checking_assert (DECL_TINFO_P (decl) || DECL_FNAME_P (decl));
if (complain & tf_error)
error ("the address of %qD is not a valid template argument",
decl);
diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class61.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class61.C
new file mode 100644
index 00000000000..4033cf0f271
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class61.C
@@ -0,0 +1,25 @@
+// PR c++/113242
+// { dg-do compile { target c++20 } }
+
+struct wrapper { int n; };
+
+template<const wrapper& X>
+void f1() {
+ static_assert(X.n == 42);
+}
+
+template<const wrapper* X>
+void f2() {
+ static_assert(X->n == 42);
+}
+
+template<wrapper X>
+void g() {
+ f1<X>();
+ f2<&X>();
+}
+
+int main() {
+ constexpr wrapper X = {42};
+ g<X>();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class62.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class62.C
new file mode 100644
index 00000000000..f5068fbd009
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class62.C
@@ -0,0 +1,8 @@
+// PR c++/99493
+// { dg-do compile { target c++20 } }
+
+struct owner{int m;};
+struct view{const int*m;constexpr view(const owner&o):m{&o.m}{}};
+template<view V>struct constant{};
+template<owner O>constexpr constant<O>v{};
+constexpr auto a=v<owner{}>;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-18 15:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-18 15:53 [gcc r13-8235] c++: address of class NTTP object as targ [PR113242] Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).