From e2d4577075f67cd4cb0776c2d14d399e5d147666 Mon Sep 17 00:00:00 2001 From: Diego Astiazaran Date: Thu, 8 Aug 2019 17:14:17 +0000 Subject: [clang-doc] Protect Index with mutex during reducing and generation stage Idx in ClangDocContext instance was being modified by multiple threads causing a seg fault. A mutex is added to avoid this. Differential Revision: https://reviews.llvm.org/D65915 llvm-svn: 368313 --- clang-tools-extra/clang-doc/tool/ClangDocMain.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'clang-tools-extra/clang-doc/tool/ClangDocMain.cpp') diff --git a/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp b/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp index 044bba7a025..fb1ed5b9421 100644 --- a/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp +++ b/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp @@ -36,6 +36,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/Error.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/Mutex.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" #include "llvm/Support/Signals.h" @@ -246,6 +247,7 @@ int main(int argc, const char **argv) { llvm::outs() << "Reducing " << USRToBitcode.size() << " infos...\n"; std::atomic Error; Error = false; + llvm::sys::Mutex IndexMutex; // ExecutorConcurrency is a flag exposed by AllTUsExecution.h llvm::ThreadPool Pool(ExecutorConcurrency == 0 ? llvm::hardware_concurrency() : ExecutorConcurrency); @@ -289,8 +291,10 @@ int main(int argc, const char **argv) { return; } + IndexMutex.lock(); // Add a reference to this Info in the Index clang::doc::Generator::addInfoToIndex(CDCtx.Idx, I); + IndexMutex.unlock(); if (auto Err = G->get()->generateDocForInfo(I, InfoOS, CDCtx)) llvm::errs() << toString(std::move(Err)) << "\n"; -- cgit v1.2.3