Skip to content

Commit 9a4c8e9

Browse files
committed
ModuleLoader: move PreferInterfaceForModules from SerializedModuleLoaderBase to ParseableInterfaceModuleLoader, NFC
We shouldn't over-expose this field since only ParseableInterfaceModuleLoader is using it.
1 parent 46e3003 commit 9a4c8e9

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

include/swift/Frontend/ParseableInterfaceModuleLoader.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,16 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
130130
DependencyTracker *tracker, ModuleLoadingMode loadMode,
131131
ArrayRef<std::string> PreferInterfaceForModules,
132132
bool RemarkOnRebuildFromInterface)
133-
: SerializedModuleLoaderBase(ctx, tracker, loadMode, PreferInterfaceForModules),
133+
: SerializedModuleLoaderBase(ctx, tracker, loadMode),
134134
CacheDir(cacheDir), PrebuiltCacheDir(prebuiltCacheDir),
135-
RemarkOnRebuildFromInterface(RemarkOnRebuildFromInterface)
135+
RemarkOnRebuildFromInterface(RemarkOnRebuildFromInterface),
136+
PreferInterfaceForModules(PreferInterfaceForModules)
136137
{}
137138

138139
std::string CacheDir;
139140
std::string PrebuiltCacheDir;
140141
bool RemarkOnRebuildFromInterface;
142+
ArrayRef<std::string> PreferInterfaceForModules;
141143

142144
std::error_code findModuleFilesInDirectory(
143145
AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,

include/swift/Serialization/SerializedModuleLoader.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ class SerializedModuleLoaderBase : public ModuleLoader {
4141
protected:
4242
ASTContext &Ctx;
4343
ModuleLoadingMode LoadMode;
44-
ArrayRef<std::string> PreferInterfaceForModules;
4544
SerializedModuleLoaderBase(ASTContext &ctx, DependencyTracker *tracker,
46-
ModuleLoadingMode LoadMode,
47-
ArrayRef<std::string> PreferInterfaceForModules = {});
45+
ModuleLoadingMode LoadMode);
4846

4947
void collectVisibleTopLevelModuleNamesImpl(SmallVectorImpl<Identifier> &names,
5048
StringRef extension) const;

lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,8 @@ Optional<bool> forEachModuleSearchPath(
104104

105105
// Defined out-of-line so that we can see ~ModuleFile.
106106
SerializedModuleLoaderBase::SerializedModuleLoaderBase(
107-
ASTContext &ctx, DependencyTracker *tracker, ModuleLoadingMode loadMode,
108-
ArrayRef<std::string> PreferInterfaceForModules)
109-
: ModuleLoader(tracker), Ctx(ctx), LoadMode(loadMode),
110-
PreferInterfaceForModules(PreferInterfaceForModules) {}
107+
ASTContext &ctx, DependencyTracker *tracker, ModuleLoadingMode loadMode)
108+
: ModuleLoader(tracker), Ctx(ctx), LoadMode(loadMode) {}
111109

112110
SerializedModuleLoaderBase::~SerializedModuleLoaderBase() = default;
113111
SerializedModuleLoader::~SerializedModuleLoader() = default;

0 commit comments

Comments
 (0)