benlangmuir created this revision.
benlangmuir added a reviewer: jansvoboda11.
Herald added a project: All.
benlangmuir requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
I originally thought we needed to add module file inputs for modular deps at
the same time as outputs because they depend on the lookupModuleOutput
callback, but this is not the case: they only depend on the callback results
for other modules, which have already been computed by this point. So move them
earlier so that they're set in the CompilerInvocation at the same time as other
inputs. This makes the code easier to understand.
This change is effectively NFC, though it technically changes the module exact
value of the context hash.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D142392
Files:
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
@@ -55,11 +55,6 @@
void ModuleDepCollector::addOutputPaths(CompilerInvocation &CI,
ModuleDeps &Deps) {
- // These are technically *inputs* to the compilation, but we populate them
- // here in order to make \c getModuleContextHash() independent of
- // \c lookupModuleOutput().
- addModuleFiles(CI, Deps.ClangModuleDeps);
-
CI.getFrontendOpts().OutputFile =
Consumer.lookupModuleOutput(Deps.ID, ModuleOutputKind::ModuleFile);
if (!CI.getDiagnosticOpts().DiagnosticSerializationFile.empty())
@@ -156,6 +151,9 @@
for (const auto &PrebuiltModule : Deps.PrebuiltModuleDeps)
CI.getFrontendOpts().ModuleFiles.push_back(PrebuiltModule.PCMFile);
+ // Add module file inputs from dependencies.
+ addModuleFiles(CI, Deps.ClangModuleDeps);
+
// Remove any macro definitions that are explicitly ignored.
if (!CI.getHeaderSearchOpts().ModulesIgnoreMacros.empty()) {
llvm::erase_if(
Index: clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
===================================================================
--- clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
+++ clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
@@ -55,11 +55,6 @@
void ModuleDepCollector::addOutputPaths(CompilerInvocation &CI,
ModuleDeps &Deps) {
- // These are technically *inputs* to the compilation, but we populate them
- // here in order to make \c getModuleContextHash() independent of
- // \c lookupModuleOutput().
- addModuleFiles(CI, Deps.ClangModuleDeps);
-
CI.getFrontendOpts().OutputFile =
Consumer.lookupModuleOutput(Deps.ID, ModuleOutputKind::ModuleFile);
if (!CI.getDiagnosticOpts().DiagnosticSerializationFile.empty())
@@ -156,6 +151,9 @@
for (const auto &PrebuiltModule : Deps.PrebuiltModuleDeps)
CI.getFrontendOpts().ModuleFiles.push_back(PrebuiltModule.PCMFile);
+ // Add module file inputs from dependencies.
+ addModuleFiles(CI, Deps.ClangModuleDeps);
+
// Remove any macro definitions that are explicitly ignored.
if (!CI.getHeaderSearchOpts().ModulesIgnoreMacros.empty()) {
llvm::erase_if(
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
