Author: Jan Svoboda Date: 2025-04-29T10:24:38-07:00 New Revision: 0f90a7b323bcaa087be31aa135b71694db2d5ff9
URL: https://github.com/llvm/llvm-project/commit/0f90a7b323bcaa087be31aa135b71694db2d5ff9 DIFF: https://github.com/llvm/llvm-project/commit/0f90a7b323bcaa087be31aa135b71694db2d5ff9.diff LOG: [clang] Enable making the `CompilerInstance` module dependency collector thread-safe (#137227) The same principle as #135473, #135737, #136178, #136601 & #137059. Added: Modified: clang/include/clang/Frontend/CompilerInstance.h clang/lib/Frontend/CompilerInstance.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Frontend/CompilerInstance.h b/clang/include/clang/Frontend/CompilerInstance.h index 7de4fb531d0e7..ee15b1023eb26 100644 --- a/clang/include/clang/Frontend/CompilerInstance.h +++ b/clang/include/clang/Frontend/CompilerInstance.h @@ -839,16 +839,23 @@ class CompilerInstance : public ModuleLoader { class ThreadSafeCloneConfig { IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS; DiagnosticConsumer &DiagConsumer; + std::shared_ptr<ModuleDependencyCollector> ModuleDepCollector; public: - ThreadSafeCloneConfig(IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS, - DiagnosticConsumer &DiagConsumer) - : VFS(std::move(VFS)), DiagConsumer(DiagConsumer) { + ThreadSafeCloneConfig( + IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS, + DiagnosticConsumer &DiagConsumer, + std::shared_ptr<ModuleDependencyCollector> ModuleDepCollector = nullptr) + : VFS(std::move(VFS)), DiagConsumer(DiagConsumer), + ModuleDepCollector(std::move(ModuleDepCollector)) { assert(this->VFS && "Clone config requires non-null VFS"); } IntrusiveRefCntPtr<llvm::vfs::FileSystem> getVFS() const { return VFS; } DiagnosticConsumer &getDiagConsumer() const { return DiagConsumer; } + std::shared_ptr<ModuleDependencyCollector> getModuleDepCollector() const { + return ModuleDepCollector; + } }; private: diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 2d6ab87964486..cbc9c9dcee05f 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -1257,10 +1257,14 @@ std::unique_ptr<CompilerInstance> CompilerInstance::cloneForModuleCompileImpl( Instance.GetDependencyDirectives = GetDependencyDirectives->cloneFor(Instance.getFileManager()); - // If we're collecting module dependencies, we need to share a collector - // between all of the module CompilerInstances. Other than that, we don't - // want to produce any dependency output from the module build. - Instance.setModuleDepCollector(getModuleDepCollector()); + if (ThreadSafeConfig) { + Instance.setModuleDepCollector(ThreadSafeConfig->getModuleDepCollector()); + } else { + // If we're collecting module dependencies, we need to share a collector + // between all of the module CompilerInstances. Other than that, we don't + // want to produce any dependency output from the module build. + Instance.setModuleDepCollector(getModuleDepCollector()); + } Inv.getDependencyOutputOpts() = DependencyOutputOptions(); return InstancePtr; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
