diff options
| author | Patrick Palka <ppalka@redhat.com> | 2022-10-20 11:33:39 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2022-10-20 11:33:39 -0400 |
| commit | 9a8b37f5476ba1f92fd9a85add035ace89535e79 (patch) | |
| tree | 619427c4b055fc791a9af3404c5b79452ce58654 /gcc | |
| parent | e10ca9544632dbff4759b4b92886cd96d0b9bdfe (diff) | |
| download | gcc-9a8b37f5476ba1f92fd9a85add035ace89535e79.zip gcc-9a8b37f5476ba1f92fd9a85add035ace89535e79.tar.gz gcc-9a8b37f5476ba1f92fd9a85add035ace89535e79.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/module.cc | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/concept-7_a.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/concept-7_b.C | 7 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 2c2f9a9..73971e7 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 0000000..a39b31b --- /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 0000000..1f81208 --- /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" } |