[PATCH] D118599: [C++20][Modules][8/8] Amend module visibility rules for partitions.
Iain Sandoe via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Feb 17 08:30:43 PST 2022
iains updated this revision to Diff 409671.
iains added a comment.
rebase onto parent patch changes.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D118599/new/
https://reviews.llvm.org/D118599
Files:
clang/lib/Sema/SemaLookup.cpp
clang/test/Modules/cxx20-10-1-ex2.cpp
Index: clang/test/Modules/cxx20-10-1-ex2.cpp
===================================================================
--- clang/test/Modules/cxx20-10-1-ex2.cpp
+++ clang/test/Modules/cxx20-10-1-ex2.cpp
@@ -11,9 +11,8 @@
// RUN: %clang_cc1 -std=c++20 -emit-module-interface -D TU=3 -x c++ %s \
// RUN: -o %t/B_X1.pcm -verify
-// Not expected to work yet.
-// %clang_cc1 -std=c++20 -emit-module-interface -D TU=4 -x c++ %s \
-// -fmodule-file=%t/B.pcm -o %t/B_X2.pcm
+// RUN: %clang_cc1 -std=c++20 -emit-module-interface -D TU=4 -x c++ %s \
+// RUN: -fmodule-file=%t/B.pcm -o %t/B_X2.pcm
// RUN: %clang_cc1 -std=c++20 -emit-obj -D TU=5 -x c++ %s \
// RUN: -fmodule-file=%t/B.pcm -o %t/b_tu5.s
@@ -21,9 +20,8 @@
// RUN: %clang_cc1 -std=c++20 -S -D TU=6 -x c++ %s \
// RUN: -fmodule-file=%t/B.pcm -o %t/b_tu6.s -verify
-// Not expected to work yet.
-// %clang_cc1 -std=c++20 -emit-module-interface -D TU=7 -x c++ %s \
-// -fmodule-file=%t/B_X2.pcm -o %t/B_X3.pcm -verify
+// RUN: %clang_cc1 -std=c++20 -emit-module-interface -D TU=7 -x c++ %s \
+// RUN: -fmodule-file=%t/B_X2.pcm -o %t/B_X3.pcm -verify
#if TU == 1
module B:Y;
Index: clang/lib/Sema/SemaLookup.cpp
===================================================================
--- clang/lib/Sema/SemaLookup.cpp
+++ clang/lib/Sema/SemaLookup.cpp
@@ -1687,8 +1687,8 @@
Module *DeclModule = SemaRef.getOwningModule(D);
assert(DeclModule && "hidden decl has no owning module");
- // If the owning module is visible, the decl is visible.
if (SemaRef.isModuleVisible(DeclModule, D->isModulePrivate()))
+ // If the owning module is visible, the decl is visible.
return true;
// Determine whether a decl context is a file context for the purpose of
@@ -1762,6 +1762,22 @@
if (ModulePrivate) {
if (isInCurrentModule(M, getLangOpts()))
return true;
+ else if (M->Kind == Module::ModuleKind::ModulePartitionImplementation &&
+ isModuleDirectlyImported(M))
+ // Unless a partition implementation is directly imported it is not
+ // counted as visible for lookup, although the contained decls might
+ // still be reachable. It's a partition, so it must be part of the
+ // current module to be a valid import.
+ return true;
+ else if (getLangOpts().CPlusPlusModules && !ModuleScopes.empty() &&
+ ModuleScopes[0].Module->Kind ==
+ Module::ModuleKind::ModulePartitionImplementation &&
+ ModuleScopes[0].Module->getPrimaryModuleInterfaceName() ==
+ M->Name &&
+ isModuleDirectlyImported(M))
+ // We are building a module implementation partition and the TU imports
+ // the primary module interface unit.
+ return true;
} else {
if (VisibleModules.isVisible(M))
return true;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118599.409671.patch
Type: text/x-patch
Size: 2826 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220217/f57f401b/attachment-0001.bin>
More information about the cfe-commits
mailing list