From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 5F6C83858D33; Thu, 18 Jan 2024 15:53:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F6C83858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705593225; bh=aBUG9iaw8KSJRBu/Ns7Etp2MN74SRUaW5dNZnGIMJfc=; h=From:To:Subject:Date:From; b=g49oXpnQHMpbJtNyYijiyaDnfq6Bez1O2MknNQ3ZfH1rW/pW0rab1YdpsIAMDlZNz /Ig2jUhjStsBZEIk71UErPYqScLJZ6Mdgj0NPqA1KgyJDxq8x8RmL0WstJxXgrYgGT oAiosiCJuCcLLBgcBWFa2Y7avlcYuzKFXbrgbKjw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-8235] c++: address of class NTTP object as targ [PR113242] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: b4af3ed9a75135b8e3e5d57b4d1e2adaec52e8fc X-Git-Newrev: 4ffb23975b32bfd285915c3d6659b837868b5aa9 Message-Id: <20240118155345.5F6C83858D33@sourceware.org> Date: Thu, 18 Jan 2024 15:53:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4ffb23975b32bfd285915c3d6659b837868b5aa9 commit r13-8235-g4ffb23975b32bfd285915c3d6659b837868b5aa9 Author: Patrick Palka 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) : 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 (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 +void f1() { + static_assert(X.n == 42); +} + +template +void f2() { + static_assert(X->n == 42); +} + +template +void g() { + f1(); + f2<&X>(); +} + +int main() { + constexpr wrapper X = {42}; + g(); +} 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}{}}; +templatestruct constant{}; +templateconstexpr constantv{}; +constexpr auto a=v;