Skip to content

Commit d7863ce

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 2062ee8 commit d7863ce

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
@@ -134,14 +134,16 @@ class ParseableInterfaceModuleLoader : public SerializedModuleLoaderBase {
134134
DependencyTracker *tracker, ModuleLoadingMode loadMode,
135135
ArrayRef<std::string> PreferInterfaceForModules,
136136
bool RemarkOnRebuildFromInterface)
137-
: SerializedModuleLoaderBase(ctx, tracker, loadMode, PreferInterfaceForModules),
137+
: SerializedModuleLoaderBase(ctx, tracker, loadMode),
138138
CacheDir(cacheDir), PrebuiltCacheDir(prebuiltCacheDir),
139-
RemarkOnRebuildFromInterface(RemarkOnRebuildFromInterface)
139+
RemarkOnRebuildFromInterface(RemarkOnRebuildFromInterface),
140+
PreferInterfaceForModules(PreferInterfaceForModules)
140141
{}
141142

142143
std::string CacheDir;
143144
std::string PrebuiltCacheDir;
144145
bool RemarkOnRebuildFromInterface;
146+
ArrayRef<std::string> PreferInterfaceForModules;
145147

146148
std::error_code findModuleFilesInDirectory(
147149
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
@@ -42,10 +42,8 @@ class SerializedModuleLoaderBase : public ModuleLoader {
4242
protected:
4343
ASTContext &Ctx;
4444
ModuleLoadingMode LoadMode;
45-
ArrayRef<std::string> PreferInterfaceForModules;
4645
SerializedModuleLoaderBase(ASTContext &ctx, DependencyTracker *tracker,
47-
ModuleLoadingMode LoadMode,
48-
ArrayRef<std::string> PreferInterfaceForModules = {});
46+
ModuleLoadingMode LoadMode);
4947

5048
void collectVisibleTopLevelModuleNamesImpl(SmallVectorImpl<Identifier> &names,
5149
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)