From: Nathan Sidwell <nathan@acm.org>
To: Patrick Palka <ppalka@redhat.com>, gcc-patches@gcc.gnu.org
Cc: jason@redhat.com
Subject: Re: [PATCH] c++ modules: handle CONCEPT_DECL in node_template_info [PR102963]
Date: Thu, 20 Oct 2022 10:51:11 -0400 [thread overview]
Message-ID: <a19dfb9e-2edb-b7c0-0730-4571c2c8320c@acm.org> (raw)
In-Reply-To: <20221020140740.415427-1-ppalka@redhat.com>
On 10/20/22 10:07, Patrick Palka wrote:
> Here node_template_info is overlooking that CONCEPT_DECL has TEMPLATE_INFO
> too, which makes get_originating_module_decl for the CONCEPT_DECL fail to
> return the corresponding TEMPLATE_DECL, which leads to an ICE from
> import_entity_index while pretty printing the CONCEPT_DECL's module
> suffix as part of the failed static assert diagnostic.
ok
>
> Tested on x86_64-pc-linux-gnu, does this look OK for trunk?
>
> PR c++/102963
>
> gcc/cp/ChangeLog:
>
> * module.cc (node_template_info): Handle CONCEPT_DECL.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/modules/concept-7_a.C: New test.
> * g++.dg/modules/concept-7_b.C: New test.
> ---
> gcc/cp/module.cc | 3 ++-
> gcc/testsuite/g++.dg/modules/concept-7_a.C | 7 +++++++
> gcc/testsuite/g++.dg/modules/concept-7_b.C | 7 +++++++
> 3 files changed, 16 insertions(+), 1 deletion(-)
> create mode 100644 gcc/testsuite/g++.dg/modules/concept-7_a.C
> create mode 100644 gcc/testsuite/g++.dg/modules/concept-7_b.C
>
> diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
> index bb406a5cf01..dfed0a5ef89 100644
> --- a/gcc/cp/module.cc
> +++ b/gcc/cp/module.cc
> @@ -4046,7 +4046,8 @@ node_template_info (tree decl, int &use)
> || TREE_CODE (decl) == TYPE_DECL
> || TREE_CODE (decl) == FUNCTION_DECL
> || TREE_CODE (decl) == FIELD_DECL
> - || TREE_CODE (decl) == TEMPLATE_DECL))
> + || TREE_CODE (decl) == TEMPLATE_DECL
> + || TREE_CODE (decl) == CONCEPT_DECL))
> {
> use_tpl = DECL_USE_TEMPLATE (decl);
> ti = DECL_TEMPLATE_INFO (decl);
> diff --git a/gcc/testsuite/g++.dg/modules/concept-7_a.C b/gcc/testsuite/g++.dg/modules/concept-7_a.C
> new file mode 100644
> index 00000000000..a39b31bf7f0
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/concept-7_a.C
> @@ -0,0 +1,7 @@
> +// PR c++/102963
> +// { dg-additional-options "-fmodules-ts -fconcepts" }
> +// { dg-module-cmi pr102963 }
> +
> +export module pr102963;
> +
> +export template<class T> concept C = __is_same(T, int);
> diff --git a/gcc/testsuite/g++.dg/modules/concept-7_b.C b/gcc/testsuite/g++.dg/modules/concept-7_b.C
> new file mode 100644
> index 00000000000..1f81208ebd5
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/modules/concept-7_b.C
> @@ -0,0 +1,7 @@
> +// PR c++/102963
> +// { dg-additional-options "-fmodules-ts -fconcepts" }
> +
> +import pr102963;
> +
> +static_assert(C<int>);
> +static_assert(C<void>); // { dg-error "static assert" }
--
Nathan Sidwell
prev parent reply other threads:[~2022-10-20 14:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 14:07 Patrick Palka
2022-10-20 14:51 ` Nathan Sidwell [this message]
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=a19dfb9e-2edb-b7c0-0730-4571c2c8320c@acm.org \
--to=nathan@acm.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=ppalka@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).