Skip to content

Commit 1230966

Browse files
artemcmartemcm
committed
[Dependency Scanner] Rename 'ModuleDependenceis' -> 'ModuleDependencyInfo'
1 parent 26cf4b4 commit 1230966

16 files changed

+296
-291
lines changed

‎include/swift/AST/ASTContext.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace swift {
8787
class LazyContextData;
8888
class LazyIterableDeclContextData;
8989
class LazyMemberLoader;
90-
class ModuleDependencies;
90+
class ModuleDependencyInfo;
9191
class PatternBindingDecl;
9292
class PatternBindingInitializer;
9393
class SourceFile;
@@ -993,16 +993,16 @@ class ASTContext final {
993993
///
994994
/// \param isUnderlyingClangModule When true, only look for a Clang module
995995
/// with the given name, ignoring any Swift modules.
996-
Optional<ModuleDependencies> getModuleDependencies(
996+
Optional<ModuleDependencyInfo> getModuleDependencies(
997997
StringRef moduleName,
998998
bool isUnderlyingClangModule,
999999
ModuleDependenciesCache &cache,
10001000
InterfaceSubContextDelegate &delegate,
10011001
bool cacheOnly = false,
1002-
llvm::Optional<std::pair<std::string, swift::ModuleDependenciesKind>> dependencyOf = None);
1002+
llvm::Optional<std::pair<std::string, swift::ModuleDependencyKind>> dependencyOf = None);
10031003

10041004
/// Retrieve the module dependencies for the Swift module with the given name.
1005-
Optional<ModuleDependencies> getSwiftModuleDependencies(
1005+
Optional<ModuleDependencyInfo> getSwiftModuleDependencies(
10061006
StringRef moduleName,
10071007
ModuleDependenciesCache &cache,
10081008
InterfaceSubContextDelegate &delegate);

‎include/swift/AST/ModuleDependencies.h

Lines changed: 103 additions & 98 deletions
Large diffs are not rendered by default.

‎include/swift/AST/ModuleLoader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ class ClangImporterOptions;
4646
class ClassDecl;
4747
class FileUnit;
4848
class ModuleDecl;
49-
class ModuleDependencies;
49+
class ModuleDependencyInfo;
5050
class ModuleDependenciesCache;
5151
class NominalTypeDecl;
5252
class SourceFile;
5353
class TypeDecl;
5454
class CompilerInstance;
55-
enum class ModuleDependenciesKind : int8_t;
55+
enum class ModuleDependencyKind : int8_t;
5656

5757
enum class KnownProtocolKind : uint8_t;
5858

@@ -321,7 +321,7 @@ class ModuleLoader {
321321

322322
/// Retrieve the dependencies for the given, named module, or \c None
323323
/// if no such module exists.
324-
virtual Optional<ModuleDependencies> getModuleDependencies(
324+
virtual Optional<ModuleDependencyInfo> getModuleDependencies(
325325
StringRef moduleName,
326326
ModuleDependenciesCache &cache,
327327
InterfaceSubContextDelegate &delegate) = 0;

‎include/swift/ClangImporter/ClangImporter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class ClangImporter final : public ClangModuleLoader {
423423
ModuleDependenciesCache &cache,
424424
const clang::tooling::dependencies::FullDependenciesResult &clangDependencies);
425425

426-
Optional<ModuleDependencies> getModuleDependencies(
426+
Optional<ModuleDependencyInfo> getModuleDependencies(
427427
StringRef moduleName, ModuleDependenciesCache &cache,
428428
InterfaceSubContextDelegate &delegate) override;
429429

@@ -439,7 +439,7 @@ class ClangImporter final : public ClangModuleLoader {
439439
/// \returns \c true if an error occurred, \c false otherwise
440440
bool addBridgingHeaderDependencies(
441441
StringRef moduleName,
442-
ModuleDependenciesKind moduleKind,
442+
ModuleDependencyKind moduleKind,
443443
ModuleDependenciesCache &cache);
444444

445445
clang::TargetInfo &getTargetInfo() const override;

‎include/swift/Sema/SourceLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class SourceLoader : public ModuleLoader {
9696
// Parsing populates the Objective-C method tables.
9797
}
9898

99-
Optional<ModuleDependencies>
99+
Optional<ModuleDependencyInfo>
100100
getModuleDependencies(StringRef moduleName, ModuleDependenciesCache &cache,
101101
InterfaceSubContextDelegate &delegate) override;
102102
};

‎include/swift/Serialization/ModuleDependencyScanner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ namespace swift {
3333
Identifier moduleName;
3434

3535
/// Scan the given interface file to determine dependencies.
36-
llvm::ErrorOr<ModuleDependencies> scanInterfaceFile(
36+
llvm::ErrorOr<ModuleDependencyInfo> scanInterfaceFile(
3737
Twine moduleInterfacePath, bool isFramework);
3838

3939
InterfaceSubContextDelegate &astDelegate;
4040

4141
/// Location where pre-built moduels are to be built into.
4242
std::string moduleCachePath;
4343
public:
44-
Optional<ModuleDependencies> dependencies;
44+
Optional<ModuleDependencyInfo> dependencies;
4545

4646
ModuleDependencyScanner(ASTContext &ctx, ModuleLoadingMode LoadMode,
4747
Identifier moduleName,

‎include/swift/Serialization/SerializedModuleLoader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class SerializedModuleLoaderBase : public ModuleLoader {
137137
}
138138

139139
/// Scan the given serialized module file to determine dependencies.
140-
llvm::ErrorOr<ModuleDependencies> scanModuleFile(Twine modulePath, bool isFramework);
140+
llvm::ErrorOr<ModuleDependencyInfo> scanModuleFile(Twine modulePath, bool isFramework);
141141

142142
/// Load the module file into a buffer and also collect its module name.
143143
static std::unique_ptr<llvm::MemoryBuffer>
@@ -205,7 +205,7 @@ class SerializedModuleLoaderBase : public ModuleLoader {
205205

206206
virtual void verifyAllModules() override;
207207

208-
virtual Optional<ModuleDependencies> getModuleDependencies(
208+
virtual Optional<ModuleDependencyInfo> getModuleDependencies(
209209
StringRef moduleName, ModuleDependenciesCache &cache,
210210
InterfaceSubContextDelegate &delegate) override;
211211
};

‎lib/AST/ASTContext.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,7 @@ Identifier ASTContext::getRealModuleName(Identifier key, ModuleAliasLookupOption
18821882
using ModuleDependencyIDSet =
18831883
std::unordered_set<ModuleDependencyID,
18841884
llvm::pair_hash<std::string,
1885-
ModuleDependenciesKind>>;
1885+
ModuleDependencyKind>>;
18861886
static void findPath_dfs(ModuleDependencyID X,
18871887
ModuleDependencyID Y,
18881888
ModuleDependencyIDSet &visited,
@@ -1898,11 +1898,11 @@ static void findPath_dfs(ModuleDependencyID X,
18981898
auto node = cache.findDependencies(X.first, X.second);
18991899
assert(node.has_value() && "Expected cache value for dependency.");
19001900
for (const auto &dep : node->getModuleDependencies()) {
1901-
Optional<ModuleDependenciesKind> lookupKind = None;
1901+
Optional<ModuleDependencyKind> lookupKind = None;
19021902
// Underlying Clang module needs an explicit lookup to avoid confusing it
19031903
// with the parent Swift module.
19041904
if ((dep == X.first && node->isSwiftModule()) || node->isClangModule())
1905-
lookupKind = ModuleDependenciesKind::Clang;
1905+
lookupKind = ModuleDependencyKind::Clang;
19061906

19071907
auto depNode = cache.findDependencies(dep, lookupKind);
19081908
if (!depNode.has_value())
@@ -1919,12 +1919,12 @@ static std::vector<ModuleDependencyID>
19191919
findPathToDependency(ModuleDependencyID dependency,
19201920
const ModuleDependenciesCache &cache) {
19211921
auto mainModuleDep = cache.findDependencies(cache.getMainModuleName(),
1922-
ModuleDependenciesKind::SwiftSource);
1922+
ModuleDependencyKind::SwiftSource);
19231923
// We may be in a batch scan instance which does not have this dependency
19241924
if (!mainModuleDep.has_value())
19251925
return {};
19261926
auto mainModuleID = std::make_pair(cache.getMainModuleName().str(),
1927-
ModuleDependenciesKind::SwiftSource);
1927+
ModuleDependencyKind::SwiftSource);
19281928
auto visited = ModuleDependencyIDSet();
19291929
auto stack = std::vector<ModuleDependencyID>();
19301930
auto dependencyPath = std::vector<ModuleDependencyID>();
@@ -1953,19 +1953,19 @@ static void diagnoseScannerFailure(StringRef moduleName,
19531953
std::string moduleFilePath = "";
19541954
bool isClang = false;
19551955
switch (entryNode->getKind()) {
1956-
case swift::ModuleDependenciesKind::SwiftSource:
1956+
case swift::ModuleDependencyKind::SwiftSource:
19571957
Diags.diagnose(SourceLoc(), diag::dependency_as_imported_by_main_module, entry.first);
19581958
continue;
1959-
case swift::ModuleDependenciesKind::SwiftInterface:
1959+
case swift::ModuleDependencyKind::SwiftInterface:
19601960
moduleFilePath = entryNode->getAsSwiftInterfaceModule()->swiftInterfaceFile;
19611961
break;
1962-
case swift::ModuleDependenciesKind::SwiftBinary:
1962+
case swift::ModuleDependencyKind::SwiftBinary:
19631963
moduleFilePath = entryNode->getAsSwiftBinaryModule()->compiledModulePath;
19641964
break;
1965-
case swift::ModuleDependenciesKind::SwiftPlaceholder:
1965+
case swift::ModuleDependencyKind::SwiftPlaceholder:
19661966
moduleFilePath = entryNode->getAsPlaceholderDependencyModule()->compiledModulePath;
19671967
break;
1968-
case swift::ModuleDependenciesKind::Clang:
1968+
case swift::ModuleDependencyKind::Clang:
19691969
moduleFilePath = entryNode->getAsClangModule()->moduleMapFile;
19701970
isClang = true;
19711971
break;
@@ -1981,7 +1981,7 @@ static void diagnoseScannerFailure(StringRef moduleName,
19811981
}
19821982
}
19831983

1984-
Optional<ModuleDependencies> ASTContext::getModuleDependencies(
1984+
Optional<ModuleDependencyInfo> ASTContext::getModuleDependencies(
19851985
StringRef moduleName, bool isUnderlyingClangModule,
19861986
ModuleDependenciesCache &cache, InterfaceSubContextDelegate &delegate,
19871987
bool cacheOnly, llvm::Optional<ModuleDependencyID> dependencyOf) {
@@ -1991,20 +1991,20 @@ Optional<ModuleDependencies> ASTContext::getModuleDependencies(
19911991
// Check whether we've cached this result.
19921992
if (!isUnderlyingClangModule) {
19931993
if (auto found = cache.findDependencies(
1994-
moduleName, ModuleDependenciesKind::SwiftSource))
1994+
moduleName, ModuleDependencyKind::SwiftSource))
19951995
return found;
19961996
if (auto found = cache.findDependencies(
1997-
moduleName, ModuleDependenciesKind::SwiftInterface))
1997+
moduleName, ModuleDependencyKind::SwiftInterface))
19981998
return found;
19991999
if (auto found = cache.findDependencies(
2000-
moduleName, ModuleDependenciesKind::SwiftBinary))
2000+
moduleName, ModuleDependencyKind::SwiftBinary))
20012001
return found;
20022002
if (auto found = cache.findDependencies(
2003-
moduleName, ModuleDependenciesKind::SwiftPlaceholder))
2003+
moduleName, ModuleDependencyKind::SwiftPlaceholder))
20042004
return found;
20052005
}
20062006
if (auto found = cache.findDependencies(
2007-
moduleName, ModuleDependenciesKind::Clang))
2007+
moduleName, ModuleDependencyKind::Clang))
20082008
return found;
20092009
} else {
20102010
for (auto &loader : getImpl().ModuleLoaders) {
@@ -2024,7 +2024,7 @@ Optional<ModuleDependencies> ASTContext::getModuleDependencies(
20242024
return None;
20252025
}
20262026

2027-
Optional<ModuleDependencies>
2027+
Optional<ModuleDependencyInfo>
20282028
ASTContext::getSwiftModuleDependencies(StringRef moduleName,
20292029
ModuleDependenciesCache &cache,
20302030
InterfaceSubContextDelegate &delegate) {

0 commit comments

Comments
 (0)