maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix llvm-dsymutil test in -DLLVM_ENABLE_THREADS=OFF mode 

After r316999, tools/dsymutil/X86/alias.test started failing in builds
that have threading disabled.

llvm-svn: 317263
This commit is contained in:
Hans Wennborg 2017-11-02 20:22:03 +00:00
parent 20910f46b6
commit f55435ab61
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/tools/dsymutil/dsymutil.cpp
View File

@ -338,7 +338,6 @@ int main(int argc, char **argv) {
NumThreads = 1;
NumThreads = std::min<unsigned>(NumThreads, DebugMapPtrsOrErr->size());
llvm::ThreadPool Threads(NumThreads);
// If there is more than one link to execute, we need to generate
// temporary files.
@ -366,17 +365,19 @@ int main(int argc, char **argv) {
// FIXME: The DwarfLinker can have some very deep recursion that can max
// out the (significantly smaller) stack when using threads. We don't
// want this limitation when we only have a single thread.
if (NumThreads == 1)
if (NumThreads == 1) {
LinkLambda();
else
} else {
llvm::ThreadPool Threads(NumThreads);
Threads.async(LinkLambda);
Threads.wait();
}
if (NeedsTempFiles)
TempFiles.emplace_back(Map->getTriple().getArchName().str(),
OutputFile);
}
Threads.wait();
if (NeedsTempFiles &&
!MachOUtils::generateUniversalBinary(