[llvm] ebbbd93 - ManagedStatic: remove from DynamicLibrary
Nicolai Hähnle via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 25 08:07:03 PDT 2022
Author: Nicolai Hähnle
Date: 2022-08-25T17:06:43+02:00
New Revision: ebbbd93e3cd8c91b5ac01540c05c619236a90289
URL: https://github.com/llvm/llvm-project/commit/ebbbd93e3cd8c91b5ac01540c05c619236a90289
DIFF: https://github.com/llvm/llvm-project/commit/ebbbd93e3cd8c91b5ac01540c05c619236a90289.diff
LOG: ManagedStatic: remove from DynamicLibrary
v2:
- fix Windows build issues
Differential Revision: https://reviews.llvm.org/D129127
Added:
Modified:
llvm/lib/Support/DynamicLibrary.cpp
llvm/lib/Support/Windows/DynamicLibrary.inc
llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Support/DynamicLibrary.cpp b/llvm/lib/Support/DynamicLibrary.cpp
index 7b9d7abe7545d..319fbc59d43bb 100644
--- a/llvm/lib/Support/DynamicLibrary.cpp
+++ b/llvm/lib/Support/DynamicLibrary.cpp
@@ -15,7 +15,6 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Config/config.h"
-#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Mutex.h"
#include <vector>
@@ -107,12 +106,22 @@ class DynamicLibrary::HandleSet {
};
namespace {
-// Collection of symbol name/value pairs to be searched prior to any libraries.
-static llvm::ManagedStatic<llvm::StringMap<void *>> ExplicitSymbols;
-// Collection of known library handles.
-static llvm::ManagedStatic<DynamicLibrary::HandleSet> OpenedHandles;
-// Lock for ExplicitSymbols and OpenedHandles.
-static llvm::ManagedStatic<llvm::sys::SmartMutex<true>> SymbolsMutex;
+
+struct Globals {
+ // Collection of symbol name/value pairs to be searched prior to any
+ // libraries.
+ llvm::StringMap<void *> ExplicitSymbols;
+ // Collection of known library handles.
+ DynamicLibrary::HandleSet OpenedHandles;
+ // Lock for ExplicitSymbols and OpenedHandles.
+ llvm::sys::SmartMutex<true> SymbolsMutex;
+};
+
+Globals &getGlobals() {
+ static Globals G;
+ return G;
+}
+
} // namespace
#ifdef _WIN32
@@ -136,20 +145,18 @@ void *SearchForAddressOfSpecialSymbol(const char *SymbolName) {
} // namespace llvm
void DynamicLibrary::AddSymbol(StringRef SymbolName, void *SymbolValue) {
- SmartScopedLock<true> Lock(*SymbolsMutex);
- (*ExplicitSymbols)[SymbolName] = SymbolValue;
+ auto &G = getGlobals();
+ SmartScopedLock<true> Lock(G.SymbolsMutex);
+ G.ExplicitSymbols[SymbolName] = SymbolValue;
}
DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *FileName,
std::string *Err) {
- // Force OpenedHandles to be added into the ManagedStatic list before any
- // ManagedStatic can be added from static constructors in HandleSet::DLOpen.
- HandleSet& HS = *OpenedHandles;
-
+ auto &G = getGlobals();
void *Handle = HandleSet::DLOpen(FileName, Err);
if (Handle != &Invalid) {
- SmartScopedLock<true> Lock(*SymbolsMutex);
- HS.AddLibrary(Handle, /*IsProcess*/ FileName == nullptr);
+ SmartScopedLock<true> Lock(G.SymbolsMutex);
+ G.OpenedHandles.AddLibrary(Handle, /*IsProcess*/ FileName == nullptr);
}
return DynamicLibrary(Handle);
@@ -157,9 +164,11 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *FileName,
DynamicLibrary DynamicLibrary::addPermanentLibrary(void *Handle,
std::string *Err) {
- SmartScopedLock<true> Lock(*SymbolsMutex);
+ auto &G = getGlobals();
+ SmartScopedLock<true> Lock(G.SymbolsMutex);
// If we've already loaded this library, tell the caller.
- if (!OpenedHandles->AddLibrary(Handle, /*IsProcess*/false, /*CanClose*/false))
+ if (!G.OpenedHandles.AddLibrary(Handle, /*IsProcess*/ false,
+ /*CanClose*/ false))
*Err = "Library already loaded";
return DynamicLibrary(Handle);
@@ -173,21 +182,18 @@ void *DynamicLibrary::getAddressOfSymbol(const char *SymbolName) {
void *DynamicLibrary::SearchForAddressOfSymbol(const char *SymbolName) {
{
- SmartScopedLock<true> Lock(*SymbolsMutex);
+ auto &G = getGlobals();
+ SmartScopedLock<true> Lock(G.SymbolsMutex);
// First check symbols added via AddSymbol().
- if (ExplicitSymbols.isConstructed()) {
- StringMap<void *>::iterator i = ExplicitSymbols->find(SymbolName);
+ StringMap<void *>::iterator i = G.ExplicitSymbols.find(SymbolName);
- if (i != ExplicitSymbols->end())
- return i->second;
- }
+ if (i != G.ExplicitSymbols.end())
+ return i->second;
// Now search the libraries.
- if (OpenedHandles.isConstructed()) {
- if (void *Ptr = OpenedHandles->Lookup(SymbolName, SearchOrder))
- return Ptr;
- }
+ if (void *Ptr = G.OpenedHandles.Lookup(SymbolName, SearchOrder))
+ return Ptr;
}
return llvm::SearchForAddressOfSpecialSymbol(SymbolName);
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc
index a3f78fb0d6ba5..302fdcf537edc 100644
--- a/llvm/lib/Support/Windows/DynamicLibrary.inc
+++ b/llvm/lib/Support/Windows/DynamicLibrary.inc
@@ -36,7 +36,7 @@ void *DynamicLibrary::HandleSet::DLOpen(const char *File, std::string *Err) {
// Create the instance and return it to be the *Process* handle
// simillar to dlopen(NULL, RTLD_LAZY|RTLD_GLOBAL)
if (!File)
- return &(*OpenedHandles);
+ return &getGlobals().OpenedHandles;
SmallVector<wchar_t, MAX_PATH> FileUnicode;
if (std::error_code ec = windows::UTF8ToUTF16(File, FileUnicode)) {
@@ -55,9 +55,7 @@ void *DynamicLibrary::HandleSet::DLOpen(const char *File, std::string *Err) {
}
static DynamicLibrary::HandleSet *IsOpenedHandlesInstance(void *Handle) {
- if (!OpenedHandles.isConstructed())
- return nullptr;
- DynamicLibrary::HandleSet &Inst = *OpenedHandles;
+ DynamicLibrary::HandleSet &Inst = getGlobals().OpenedHandles;
return Handle == &Inst ? &Inst : nullptr;
}
diff --git a/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp b/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
index ef17a084b41f9..3f7eef7bb8098 100644
--- a/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+++ b/llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
@@ -10,7 +10,6 @@
#include "llvm/Config/config.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
#include "gtest/gtest.h"
@@ -63,7 +62,6 @@ std::string StdString(const char *Ptr) { return Ptr ? Ptr : ""; }
TEST(DynamicLibrary, Overload) {
{
std::string Err;
- llvm_shutdown_obj Shutdown;
DynamicLibrary DL =
DynamicLibrary::getPermanentLibrary(LibPath().c_str(), &Err);
EXPECT_TRUE(DL.isValid());
@@ -111,68 +109,6 @@ TEST(DynamicLibrary, Overload) {
EXPECT_EQ(GS, &OverloadTestA);
EXPECT_EQ(StdString(GS()), "OverloadCall");
}
- EXPECT_TRUE(FuncPtr<GetString>(DynamicLibrary::SearchForAddressOfSymbol(
- "TestA")) == nullptr);
-
- // Check serach ordering is reset to default after call to llvm_shutdown
- EXPECT_EQ(DynamicLibrary::SearchOrder, DynamicLibrary::SO_Linker);
-}
-
-TEST(DynamicLibrary, Shutdown) {
- std::string A("PipSqueak"), B, C("SecondLib");
- std::vector<std::string> Order;
- {
- std::string Err;
- llvm_shutdown_obj Shutdown;
- DynamicLibrary DL =
- DynamicLibrary::getPermanentLibrary(LibPath(A).c_str(), &Err);
- EXPECT_TRUE(DL.isValid());
- EXPECT_TRUE(Err.empty());
-
- SetStrings SS_0 = FuncPtr<SetStrings>(
- DynamicLibrary::SearchForAddressOfSymbol("SetStrings"));
- EXPECT_NE(SS_0, nullptr);
-
- SS_0(A, B);
- EXPECT_EQ(B, "Local::Local(PipSqueak)");
-
- TestOrder TO_0 = FuncPtr<TestOrder>(
- DynamicLibrary::SearchForAddressOfSymbol("TestOrder"));
- EXPECT_NE(TO_0, nullptr);
-
- DynamicLibrary DL2 =
- DynamicLibrary::getPermanentLibrary(LibPath(C).c_str(), &Err);
- EXPECT_TRUE(DL2.isValid());
- EXPECT_TRUE(Err.empty());
-
- // Should find latest version of symbols in SecondLib
- SetStrings SS_1 = FuncPtr<SetStrings>(
- DynamicLibrary::SearchForAddressOfSymbol("SetStrings"));
- EXPECT_NE(SS_1, nullptr);
- EXPECT_NE(SS_0, SS_1);
-
- TestOrder TO_1 = FuncPtr<TestOrder>(
- DynamicLibrary::SearchForAddressOfSymbol("TestOrder"));
- EXPECT_NE(TO_1, nullptr);
- EXPECT_NE(TO_0, TO_1);
-
- B.clear();
- SS_1(C, B);
- EXPECT_EQ(B, "Local::Local(SecondLib)");
-
- TO_0(Order);
- TO_1(Order);
- }
- EXPECT_EQ(A, "Global::~Global");
- EXPECT_EQ(B, "Local::~Local");
- EXPECT_EQ(FuncPtr<SetStrings>(
- DynamicLibrary::SearchForAddressOfSymbol("SetStrings")),
- nullptr);
-
- // Test unload/destruction ordering
- EXPECT_EQ(Order.size(), 2UL);
- EXPECT_EQ(Order.front(), "SecondLib");
- EXPECT_EQ(Order.back(), "PipSqueak");
}
#else
More information about the llvm-commits
mailing list