jansvoboda11 created this revision. jansvoboda11 added a reviewer: benlangmuir. Herald added a subscriber: ributzka. Herald added a project: All. jansvoboda11 requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
This patch removes some dead code in the dependency scanner. The `ModuleDeps::ImplicitModulePCMPath` member stopped being used in D131934 <https://reviews.llvm.org/D131934>. The strict context hash was replaced in D129884 <https://reviews.llvm.org/D129884> by hash of the canonical command line. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D142416 Files: clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp Index: clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp =================================================================== --- clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp +++ clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp @@ -171,14 +171,6 @@ Optimize(CI); - // The original invocation probably didn't have strict context hash enabled. - // We will use the context hash of this invocation to distinguish between - // multiple incompatible versions of the same module and will use it when - // reporting dependencies to the clients. Let's make sure we're using - // **strict** context hash in order to prevent accidental sharing of - // incompatible modules (e.g. with differences in search paths). - CI.getHeaderSearchOpts().ModulesStrictContextHash = true; - return CI; } @@ -414,7 +406,6 @@ MD.ID.ModuleName = M->getFullModuleName(); MD.ImportedByMainFile = DirectModularDeps.contains(M); - MD.ImplicitModulePCMPath = std::string(M->getASTFile()->getName()); MD.IsSystem = M->IsSystem; ModuleMap &ModMapInfo = Index: clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h =================================================================== --- clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h +++ clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h @@ -87,9 +87,6 @@ /// additionally appear in \c FileDeps as a dependency. std::string ClangModuleMapFile; - /// The path to where an implicit build would put the PCM for this module. - std::string ImplicitModulePCMPath; - /// A collection of absolute paths to files that this module directly depends /// on, not including transitive dependencies. llvm::StringSet<> FileDeps;
Index: clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp =================================================================== --- clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp +++ clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp @@ -171,14 +171,6 @@ Optimize(CI); - // The original invocation probably didn't have strict context hash enabled. - // We will use the context hash of this invocation to distinguish between - // multiple incompatible versions of the same module and will use it when - // reporting dependencies to the clients. Let's make sure we're using - // **strict** context hash in order to prevent accidental sharing of - // incompatible modules (e.g. with differences in search paths). - CI.getHeaderSearchOpts().ModulesStrictContextHash = true; - return CI; } @@ -414,7 +406,6 @@ MD.ID.ModuleName = M->getFullModuleName(); MD.ImportedByMainFile = DirectModularDeps.contains(M); - MD.ImplicitModulePCMPath = std::string(M->getASTFile()->getName()); MD.IsSystem = M->IsSystem; ModuleMap &ModMapInfo = Index: clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h =================================================================== --- clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h +++ clang/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h @@ -87,9 +87,6 @@ /// additionally appear in \c FileDeps as a dependency. std::string ClangModuleMapFile; - /// The path to where an implicit build would put the PCM for this module. - std::string ImplicitModulePCMPath; - /// A collection of absolute paths to files that this module directly depends /// on, not including transitive dependencies. llvm::StringSet<> FileDeps;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
