[clang] b590ba7 - [NFC] Rename 'DependentModules' in ModuleFile to `TransitiveImports`
Chuanqi Xu via cfe-commits
cfe-commits at lists.llvm.org
Sun May 26 22:55:17 PDT 2024
Author: Chuanqi Xu
Date: 2024-05-27T13:53:38+08:00
New Revision: b590ba73a76609bace9949ea8195d2ee8213cb3f
URL: https://github.com/llvm/llvm-project/commit/b590ba73a76609bace9949ea8195d2ee8213cb3f
DIFF: https://github.com/llvm/llvm-project/commit/b590ba73a76609bace9949ea8195d2ee8213cb3f.diff
LOG: [NFC] Rename 'DependentModules' in ModuleFile to `TransitiveImports`
Required in the review process of https://github.com/llvm/llvm-project/pull/92083
Added:
Modified:
clang/include/clang/Serialization/ASTReader.h
clang/include/clang/Serialization/ModuleFile.h
clang/lib/Serialization/ASTReader.cpp
Removed:
################################################################################
diff --git a/clang/include/clang/Serialization/ASTReader.h b/clang/include/clang/Serialization/ASTReader.h
index 75e41ea91715b..4ece4593f0738 100644
--- a/clang/include/clang/Serialization/ASTReader.h
+++ b/clang/include/clang/Serialization/ASTReader.h
@@ -2246,7 +2246,7 @@ class ASTReader
auto [Loc, ModuleFileIndex] = ReadUntranslatedSourceLocation(Raw, Seq);
ModuleFile *OwningModuleFile =
- ModuleFileIndex == 0 ? &MF : MF.DependentModules[ModuleFileIndex - 1];
+ ModuleFileIndex == 0 ? &MF : MF.TransitiveImports[ModuleFileIndex - 1];
assert(!SourceMgr.isLoadedSourceLocation(Loc) &&
"Run out source location space");
diff --git a/clang/include/clang/Serialization/ModuleFile.h b/clang/include/clang/Serialization/ModuleFile.h
index 7d8cbe3d40f56..992d26a8b88c1 100644
--- a/clang/include/clang/Serialization/ModuleFile.h
+++ b/clang/include/clang/Serialization/ModuleFile.h
@@ -513,11 +513,11 @@ class ModuleFile {
/// List of modules which this modules dependent on. Different
/// from `Imports`, this includes indirectly imported modules too.
- /// The order of DependentModules is significant. It should keep
+ /// The order of TransitiveImports is significant. It should keep
/// the same order with that module file manager when we write
/// the current module file. The value of the member will be initialized
/// in `ASTReader::ReadModuleOffsetMap`.
- llvm::SmallVector<ModuleFile *, 16> DependentModules;
+ llvm::SmallVector<ModuleFile *, 16> TransitiveImports;
/// Determine whether this module was directly imported at
/// any point during translation.
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 54414af3a646e..4a6e1d23161be 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -4059,7 +4059,7 @@ void ASTReader::ReadModuleOffsetMap(ModuleFile &F) const {
RemapBuilder DeclRemap(F.DeclRemap);
RemapBuilder TypeRemap(F.TypeRemap);
- auto &ImportedModuleVector = F.DependentModules;
+ auto &ImportedModuleVector = F.TransitiveImports;
assert(ImportedModuleVector.empty());
while (Data < DataEnd) {
More information about the cfe-commits
mailing list