From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id E148E3850413; Thu, 20 Oct 2022 15:34:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E148E3850413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666280043; bh=txO6ikwQgdq4I24NEtrVAku5znyoL+dhs3XbEMM8H4c=; h=From:To:Subject:Date:From; b=azPHIxpYSYwPJA7XqIIL3IZ1FyYbplGO7g0U1696j35SCIgB5nex4u3dKRcK7Ych2 BjGGfHxQOmbGH3yh7PCGDMuZCHRaqJWBC9uKMIzX7S1FHWwxnIW44Yz4TKmOzFYpxi S9lxmpFcy557x8bcwCmW7pIguuXmnYkjaYs7vG2Y= 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-3414] c++ modules: handle CONCEPT_DECL in node_template_info [PR102963] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: e10ca9544632dbff4759b4b92886cd96d0b9bdfe X-Git-Newrev: 9a8b37f5476ba1f92fd9a85add035ace89535e79 Message-Id: <20221020153403.E148E3850413@sourceware.org> Date: Thu, 20 Oct 2022 15:34:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9a8b37f5476ba1f92fd9a85add035ace89535e79 commit r13-3414-g9a8b37f5476ba1f92fd9a85add035ace89535e79 Author: Patrick Palka Date: Thu Oct 20 11:33:39 2022 -0400 c++ modules: handle CONCEPT_DECL in node_template_info [PR102963] Here node_template_info is overlooking that CONCEPT_DECL has TEMPLATE_INFO too, which causes get_originating_module_decl for the CONCEPT_DECL to not 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 static assert failure elaboration. 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. Diff: --- gcc/cp/module.cc | 1 + gcc/testsuite/g++.dg/modules/concept-7_a.C | 7 +++++++ gcc/testsuite/g++.dg/modules/concept-7_b.C | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 2c2f9a9a8cb..73971e7ff47 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -4046,6 +4046,7 @@ 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) == CONCEPT_DECL || TREE_CODE (decl) == TEMPLATE_DECL)) { use_tpl = DECL_USE_TEMPLATE (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 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); +static_assert(C); // { dg-error "static assert" }