<div dir="ltr">FYI this results in a build failure on Windows:<div><br></div><div><div>lib\support\Windows/DynamicLibrary.inc(74) : error C3861: 'getMutex': identifier not found</div><div>lib\support\Windows/DynamicLibrary.inc(117) : error C3861: 'getMutex': identifier not found<br>

</div><div>lib\support\Windows/DynamicLibrary.inc(120) : error C2451: conditional expression of type 'llvm::ManagedStatic<C>' is illegal<br></div><div>        with</div><div>        [</div><div>            C=llvm::StringMap<void *></div>

<div>        ]</div><div>        No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called</div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">

2013/9/18 Filip Pizlo <span dir="ltr"><<a href="mailto:fpizlo@apple.com" target="_blank">fpizlo@apple.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

Author: fpizlo<br>
Date: Wed Sep 18 01:03:27 2013<br>
New Revision: 190921<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=190921&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=190921&view=rev</a><br>
Log:<br>
Make DynamicLibrary use ManagedStatic. This is pretty simple and should just work as<br>
advertised - but it does have the caveat that calls to DynamicLibrary::AddSymbol will<br>
"reset" if you shutdown llvm and try to come back for seconds.  This is a subtle<br>
behavior change, but I'm assuming that nobody is affected by it.<br>
<br>
<br>
Modified:<br>
    llvm/trunk/lib/Support/DynamicLibrary.cpp<br>
<br>
Modified: llvm/trunk/lib/Support/DynamicLibrary.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/DynamicLibrary.cpp?rev=190921&r1=190920&r2=190921&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/DynamicLibrary.cpp?rev=190921&r1=190920&r2=190921&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/lib/Support/DynamicLibrary.cpp (original)<br>
+++ llvm/trunk/lib/Support/DynamicLibrary.cpp Wed Sep 18 01:03:27 2013<br>
@@ -14,6 +14,7 @@<br>
 //===----------------------------------------------------------------------===//<br>
<br>
 #include "llvm/Support/DynamicLibrary.h"<br>
+#include "llvm/Support/ManagedStatic.h"<br>
 #include "llvm/ADT/DenseSet.h"<br>
 #include "llvm/ADT/StringMap.h"<br>
 #include "llvm/Config/config.h"<br>
@@ -22,31 +23,12 @@<br>
 #include <cstring><br>
<br>
 // Collection of symbol name/value pairs to be searched prior to any libraries.<br>
-static llvm::StringMap<void *> *ExplicitSymbols = 0;<br>
-<br>
-namespace {<br>
-<br>
-struct ExplicitSymbolsDeleter {<br>
-  ~ExplicitSymbolsDeleter() {<br>
-    delete ExplicitSymbols;<br>
-  }<br>
-};<br>
-<br>
-}<br>
-<br>
-static ExplicitSymbolsDeleter Dummy;<br>
-<br>
-<br>
-static llvm::sys::SmartMutex<true>& getMutex() {<br>
-  static llvm::sys::SmartMutex<true> HandlesMutex;<br>
-  return HandlesMutex;<br>
-}<br>
+static llvm::ManagedStatic<llvm::StringMap<void *> > ExplicitSymbols;<br>
+static llvm::ManagedStatic<llvm::sys::SmartMutex<true> > SymbolsMutex;<br>
<br>
 void llvm::sys::DynamicLibrary::AddSymbol(StringRef symbolName,<br>
                                           void *symbolValue) {<br>
-  SmartScopedLock<true> lock(getMutex());<br>
-  if (ExplicitSymbols == 0)<br>
-    ExplicitSymbols = new StringMap<void*>();<br>
+  SmartScopedLock<true> lock(*SymbolsMutex);<br>
   (*ExplicitSymbols)[symbolName] = symbolValue;<br>
 }<br>
<br>
@@ -72,7 +54,7 @@ static DenseSet<void *> *OpenedHandles =<br>
<br>
 DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,<br>
                                                    std::string *errMsg) {<br>
-  SmartScopedLock<true> lock(getMutex());<br>
+  SmartScopedLock<true> lock(*SymbolsMutex);<br>
<br>
   void *handle = dlopen(filename, RTLD_LAZY|RTLD_GLOBAL);<br>
   if (handle == 0) {<br>
@@ -126,10 +108,10 @@ void *SearchForAddressOfSpecialSymbol(co<br>
 }<br>
<br>
 void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {<br>
-  SmartScopedLock<true> Lock(getMutex());<br>
+  SmartScopedLock<true> Lock(*SymbolsMutex);<br>
<br>
   // First check symbols added via AddSymbol().<br>
-  if (ExplicitSymbols) {<br>
+  if (ExplicitSymbols.isConstructed()) {<br>
     StringMap<void *>::iterator i = ExplicitSymbols->find(symbolName);<br>
<br>
     if (i != ExplicitSymbols->end())<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>