diff options
| author | Nathaniel Shead <nathanieloshead@gmail.com> | 2023-11-23 23:15:19 +1100 |
|---|---|---|
| committer | Nathaniel Shead <nathanieloshead@gmail.com> | 2023-12-11 13:33:52 +1100 |
| commit | ab3daffcbf35566d468c3028e48068a481048baf (patch) | |
| tree | 7bc012ce007743883f64b5909512b00ef64022d8 | |
| parent | 2c2df123de432356d28ee7e8a9627dc9e80a399d (diff) | |
| download | gcc-ab3daffcbf35566d468c3028e48068a481048baf.zip gcc-ab3daffcbf35566d468c3028e48068a481048baf.tar.gz gcc-ab3daffcbf35566d468c3028e48068a481048baf.tar.bz2 | |
c++: Clear uninstantiated template friend when instantiating [PR104234]
Otherwise attempting to get the originating module declaration ICEs
because the DECL_CHAIN of an instantiated friend template is no longer
its context.
PR c++/104234
PR c++/112580
gcc/cp/ChangeLog:
* pt.cc (tsubst_template_decl): Clear
DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P.
gcc/testsuite/ChangeLog:
* g++.dg/modules/pr104234.C: New test.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
| -rw-r--r-- | gcc/cp/pt.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/modules/pr104234.C | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 669d2ad..e9dcdb3 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -14790,6 +14790,8 @@ tsubst_template_decl (tree t, tree args, tsubst_flags_t complain, if (PRIMARY_TEMPLATE_P (t)) DECL_PRIMARY_TEMPLATE (r) = r; + DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P (r) = false; + if (!lambda_fntype && !class_p) { /* Record this non-type partial instantiation. */ diff --git a/gcc/testsuite/g++.dg/modules/pr104234.C b/gcc/testsuite/g++.dg/modules/pr104234.C new file mode 100644 index 0000000..d81f0d4 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr104234.C @@ -0,0 +1,16 @@ +// PR c++/104234 +// { dg-additional-options "-fmodules-ts" } + +template <typename> struct _Node_handle_common { + template <typename> friend class _Rb_tree; +}; +struct _Hashtable { + using node_type = _Node_handle_common<int>; + node_type __trans_tmp_1; +}; +template <typename> class _Rb_tree { + struct _Rb_tree_impl { + _Rb_tree_impl(); + } _M_impl; +}; +_Rb_tree<int> _M_tmap_; |