diff options
| author | Nathaniel Shead <nathanieloshead@gmail.com> | 2024-09-27 18:58:27 +1000 |
|---|---|---|
| committer | Nathaniel Shead <nathanieloshead@gmail.com> | 2024-09-28 08:59:01 +1000 |
| commit | cf9efe5ec14fea3ad5746fbefb22544bb9424d9d (patch) | |
| tree | 88f6bec0a73d58cb0ed860603daaafccd7c43071 /gcc/cp | |
| parent | 68854071236d3a1064b46a5b22546956d3be32cd (diff) | |
| download | gcc-cf9efe5ec14fea3ad5746fbefb22544bb9424d9d.zip gcc-cf9efe5ec14fea3ad5746fbefb22544bb9424d9d.tar.gz gcc-cf9efe5ec14fea3ad5746fbefb22544bb9424d9d.tar.bz2 | |
c++/modules: Propagate purview/import for templates in duplicate_decls [PR116803]
We need to ensure that for a declaration in the module purview, that the
resulting declaration has PURVIEW_P set and IMPORT_P cleared so that we
understand it might be something requiring exporting. This is normally
handled for a declaration by set_instantiating_module, but when this
declaration is a redeclaration duplicate_decls needs to propagate this
to olddecl.
This patch only changes the logic for template declarations, because in
the non-template case the whole contents of olddecl's DECL_LANG_SPECIFIC
is replaced with newdecl's (which includes these flags), so there's
nothing to do.
PR c++/116803
gcc/cp/ChangeLog:
* decl.cc (duplicate_decls): Propagate DECL_MODULE_PURVIEW_P and
DECL_MODULE_IMPORT_P for template redeclarations.
gcc/testsuite/ChangeLog:
* g++.dg/modules/merge-18_a.H: New test.
* g++.dg/modules/merge-18_b.H: New test.
* g++.dg/modules/merge-18_c.C: New test.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
Reviewed-by: Jason Merrill <jason@redhat.com>
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/decl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 6a7ba41..07fb985 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -2528,6 +2528,16 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden) } } + /* Propagate purviewness and importingness as with + set_instantiating_module. */ + if (modules_p ()) + { + if (DECL_MODULE_PURVIEW_P (new_result)) + DECL_MODULE_PURVIEW_P (old_result) = true; + if (!DECL_MODULE_IMPORT_P (new_result)) + DECL_MODULE_IMPORT_P (old_result) = false; + } + /* If the new declaration is a definition, update the file and line information on the declaration, and also make the old declaration the same definition. */ |