Skip to content

Commit 74dc5a1

Browse files
committed
[ModuleInterface] Remove protected helper, redundant with visible dependencyTracker member.
1 parent 6575431 commit 74dc5a1

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

include/swift/AST/ModuleLoader.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ class ModuleLoader {
6969
DependencyTracker * const dependencyTracker;
7070
ModuleLoader(DependencyTracker *tracker) : dependencyTracker(tracker) {}
7171

72-
void addDependency(StringRef file, bool IsSystem=false) {
73-
if (dependencyTracker)
74-
dependencyTracker->addDependency(file, IsSystem);
75-
}
76-
7772
public:
7873
virtual ~ModuleLoader() = default;
7974

include/swift/ClangImporter/ClangImporter.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,6 @@ class ClangImporter final : public ClangModuleLoader {
326326
/// Writes the mangled name of \p clangDecl to \p os.
327327
void getMangledName(raw_ostream &os, const clang::NamedDecl *clangDecl) const;
328328

329-
using ClangModuleLoader::addDependency;
330-
331329
// Print statistics from the Clang AST reader.
332330
void printStatistics() const override;
333331

lib/Sema/SourceLoader.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ ModuleDecl *SourceLoader::loadModule(SourceLoc importLoc,
109109
std::unique_ptr<llvm::MemoryBuffer> inputFile =
110110
std::move(inputFileOrError.get());
111111

112-
addDependency(inputFile->getBufferIdentifier());
112+
if (dependencyTracker)
113+
dependencyTracker->addDependency(inputFile->getBufferIdentifier(),
114+
/*isSystem=*/false);
113115

114116
// Turn off debugging while parsing other modules.
115117
llvm::SaveAndRestore<bool> turnOffDebug(Ctx.LangOpts.DebugConstraintSolver,

lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,9 @@ ModuleDecl *SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
549549
isFramework)) {
550550
return nullptr;
551551
}
552-
553-
addDependency(moduleInputBuffer->getBufferIdentifier());
552+
if (dependencyTracker)
553+
dependencyTracker->addDependency(moduleInputBuffer->getBufferIdentifier(),
554+
/*isSystem=*/false);
554555
}
555556

556557
assert(moduleInputBuffer);

0 commit comments

Comments
 (0)