public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4231] c++ __integer_pack conversion again [PR111357] Date: Fri, 22 Sep 2023 14:36:34 +0000 (GMT) [thread overview] Message-ID: <20230922143634.A153A3857728@sourceware.org> (raw) https://gcc.gnu.org/g:fd35d72a3dcd5ba14d81a1890236acd0145497e1 commit r14-4231-gfd35d72a3dcd5ba14d81a1890236acd0145497e1 Author: Jason Merrill <jason@redhat.com> Date: Thu Sep 21 15:39:46 2023 +0100 c++ __integer_pack conversion again [PR111357] As Jakub pointed out, the real problem here is that in a partial substitution we're forgetting the conversion to the type of the non-type template argument, because maybe_convert_nontype_argument doesn't do anything with value-dependent arguments. I'm experimenting with changing that, but in the meantime we can work around it here. PR c++/111357 gcc/cp/ChangeLog: * pt.cc (expand_integer_pack): Use IMPLICIT_CONV_EXPR. Diff: --- gcc/cp/pt.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index ea5379098a5..73ac1cb597c 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -3769,6 +3769,13 @@ expand_integer_pack (tree call, tree args, tsubst_flags_t complain, { if (hi != ohi) { + /* Work around maybe_convert_nontype_argument not doing this for + dependent arguments. Don't use IMPLICIT_CONV_EXPR_NONTYPE_ARG + because that will make tsubst_copy_and_build ignore it. */ + tree type = tsubst (TREE_TYPE (ohi), args, complain, in_decl); + if (!TREE_TYPE (hi) || !same_type_p (type, TREE_TYPE (hi))) + hi = build1 (IMPLICIT_CONV_EXPR, type, hi); + call = copy_node (call); CALL_EXPR_ARG (call, 0) = hi; } @@ -3779,8 +3786,6 @@ expand_integer_pack (tree call, tree args, tsubst_flags_t complain, } else { - hi = perform_implicit_conversion_flags (integer_type_node, hi, complain, - LOOKUP_IMPLICIT); hi = instantiate_non_dependent_expr (hi, complain); hi = cxx_constant_value (hi, complain); int len = valid_constant_size_p (hi) ? tree_to_shwi (hi) : -1;
reply other threads:[~2023-09-22 14:36 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230922143634.A153A3857728@sourceware.org \ --to=jason@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /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: linkBe 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).