From: Jakub Jelinek <jakub@redhat.com>
To: Jason Merrill <jason@redhat.com>
Cc: gcc-patches@gcc.gnu.org
Subject: [PATCH] c++: Don't reject calls through PMF during constant evaluation [PR102786]
Date: Mon, 18 Oct 2021 14:14:27 +0200 [thread overview]
Message-ID: <20211018121427.GZ304296@tucnak> (raw)
Hi!
The following testcase incorrectly rejects the c initializer,
while in the s.*a case cxx_eval_* sees .__pfn reads etc.,
in the s.*&S::foo case get_member_function_from_ptrfunc creates
expressions which use INTEGER_CSTs with type of pointer to METHOD_TYPE.
And cxx_eval_constant_expression rejects any INTEGER_CSTs with pointer
type if they aren't 0.
Either we'd need to make sure we defer such folding till cp_fold but the
function and pfn_from_ptrmemfunc is used from lots of places, or
the following patch just tries to reject only non-zero INTEGER_CSTs
with pointer types if they don't point to METHOD_TYPE in the hope that
all such INTEGER_CSTs with POINTER_TYPE to METHOD_TYPE are result of
folding valid pointer-to-member function expressions.
I don't immediately see how one could create such INTEGER_CSTs otherwise,
cast of integers to PMF is rejected and would have the PMF RECORD_TYPE
anyway, etc.
Regtested on x86_64-linux
(with GXX_TESTSUITE_STDS=98,11,14,17,20,2b make check-g++)
ok for trunk if it passes full bootstrap/regtest?
2021-10-18 Jakub Jelinek <jakub@redhat.com>
PR c++/102786
* constexpr.c (cxx_eval_constant_expression): Don't reject
INTEGER_CSTs with type POINTER_TYPE to METHOD_TYPE.
* g++.dg/cpp2a/constexpr-virtual19.C: New test.
--- gcc/cp/constexpr.c.jj 2021-10-15 11:59:15.917687093 +0200
+++ gcc/cp/constexpr.c 2021-10-18 13:26:49.458610657 +0200
@@ -6191,6 +6191,7 @@ cxx_eval_constant_expression (const cons
if (TREE_CODE (t) == INTEGER_CST
&& TYPE_PTR_P (TREE_TYPE (t))
+ && TREE_CODE (TREE_TYPE (TREE_TYPE (t))) != METHOD_TYPE
&& !integer_zerop (t))
{
if (!ctx->quiet)
--- gcc/testsuite/g++.dg/cpp2a/constexpr-virtual19.C.jj 2021-10-18 13:35:00.229693908 +0200
+++ gcc/testsuite/g++.dg/cpp2a/constexpr-virtual19.C 2021-10-18 12:31:05.265747723 +0200
@@ -0,0 +1,11 @@
+// PR c++/102786
+// { dg-do compile { target c++20 } }
+
+struct S {
+ virtual constexpr int foo () const { return 42; }
+};
+
+constexpr S s;
+constexpr auto a = &S::foo;
+constexpr auto b = (s.*a) ();
+constexpr auto c = (s.*&S::foo) ();
Jakub
next reply other threads:[~2021-10-18 12:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 12:14 Jakub Jelinek [this message]
2021-10-18 16:57 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211018121427.GZ304296@tucnak \
--to=jakub@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).