From 6afe2fa28816b5b208a0140372900325709271c4 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Wed, 20 May 2009 21:03:06 +0000 Subject: [PATCH] Have llvm_start_multithreaded return a bool indicating whether multithreaded initialization succeeded or not, rather than just asserting. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72182 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/ManagedStatic.h | 6 ++++-- lib/Support/ManagedStatic.cpp | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/llvm/Support/ManagedStatic.h b/include/llvm/Support/ManagedStatic.h index 7eecce3241d..619cc205525 100644 --- a/include/llvm/Support/ManagedStatic.h +++ b/include/llvm/Support/ManagedStatic.h @@ -96,8 +96,10 @@ public: /// llvm_start_multithreaded - Allocate and initialize structures needed to -/// make LLVM safe for multithreading. -void llvm_start_multithreaded(); +/// make LLVM safe for multithreading. The return value indicates whether +/// multithreaded initialization succeeded. LLVM will still be operational +/// on "failed" return, but will not be safe to run multithreaded. +bool llvm_start_multithreaded(); /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables. void llvm_shutdown(); diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp index 056b6c06c1e..a3b2bcc66a9 100644 --- a/lib/Support/ManagedStatic.cpp +++ b/lib/Support/ManagedStatic.cpp @@ -68,12 +68,13 @@ void ManagedStaticBase::destroy() const { DeleterFn = 0; } -void llvm::llvm_start_multithreaded() { +bool llvm::llvm_start_multithreaded() { #if LLVM_MULTITHREADED assert(ManagedStaticMutex == 0 && "Multithreaded LLVM already initialized!"); ManagedStaticMutex = new sys::Mutex(true); + return true; #else - assert(0 && "LLVM built without multithreading support!"); + return false; #endif }