Replace std::string pointer by reference and remove unused function D…

…LSym Signed-off-by: Shreyas Atre <[email protected]>
compiler-research · Jan 27, 2024 · f6d467d · f6d467d
1 parent e61e7ca
commit f6d467d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/lib/Interpreter/DynamicLibraryManager.cpp b/lib/Interpreter/DynamicLibraryManager.cpp
@@ -365,7 +365,7 @@ namespace Cpp {
     // TODO: !permanent case
 
     std::string errMsg;
-    DyLibHandle dyLibHandle = platform::DLOpen(canonicalLoadedLib, &errMsg);
+    DyLibHandle dyLibHandle = platform::DLOpen(canonicalLoadedLib, errMsg);
     if (!dyLibHandle) {
       // We emit callback to LibraryLoadingFailed when we get error with error message.
       //TODO: Implement callbacks
@@ -403,7 +403,7 @@ namespace Cpp {
     // TODO: !permanent case
 
     std::string errMsg;
-    platform::DLClose(dyLibHandle, &errMsg);
+    platform::DLClose(dyLibHandle, errMsg);
     if (!errMsg.empty()) {
       LLVM_DEBUG(dbgs() << "cling::DynamicLibraryManager::unloadLibrary(): "
                         << errMsg << '\n');

diff --git a/lib/Interpreter/Paths.cpp b/lib/Interpreter/Paths.cpp
@@ -107,41 +107,26 @@ namespace platform {
   }
 
 #if defined(LLVM_ON_UNIX)
-  static void DLErr(std::string* Err) {
-    if (!Err)
+  static void DLErr(std::string& Err) {
+    if (Err.empty())
       return;
     if (const char* DyLibError = ::dlerror())
-      *Err = DyLibError;
+      Err = std::string(DyLibError);
   }
 
-  void* DLOpen(const std::string& Path, std::string* Err /* = nullptr */) {
+  void* DLOpen(const std::string& Path, std::string& Err /* = nullptr */) {
     void* Lib = ::dlopen(Path.c_str(), RTLD_LAZY | RTLD_GLOBAL);
     DLErr(Err);
     return Lib;
   }
 
-  void* DLSym(const std::string& Name, std::string* Err /* = nullptr*/) {
-    if (void* Self = ::dlopen(nullptr, RTLD_GLOBAL)) {
-      // get dlopen error if there is one
-      DLErr(Err);
-      void* Sym = ::dlsym(Self, Name.c_str());
-      // overwrite error if dlsym caused one
-      DLErr(Err);
-      // only get dlclose error if dlopen & dlsym haven't emited one
-      DLClose(Self, Err && Err->empty() ? Err : nullptr);
-      return Sym;
-    }
-    DLErr(Err);
-    return nullptr;
-  }
-
-  void DLClose(void* Lib, std::string* Err /* = nullptr*/) {
+  void DLClose(void* Lib, std::string& Err /* = nullptr*/) {
     ::dlclose(Lib);
     DLErr(Err);
   }
 #elif defined(_WIN32)
 
-  void* DLOpen(const std::string& Path, std::string* Err /* = nullptr */) {
+  void* DLOpen(const std::string& Path, std::string& Err /* = nullptr */) {
     auto lib = llvm::sys::DynamicLibrary::getLibrary(Path.c_str(), Err);
     return lib.getOSSpecificHandle();
   }

diff --git a/lib/Interpreter/Paths.h b/lib/Interpreter/Paths.h
@@ -47,9 +47,9 @@ std::string NormalizePath(const std::string& Path);
 ///
 /// \returns the library handle
 ///
-void* DLOpen(const std::string& Path, std::string* Err = nullptr);
+void* DLOpen(const std::string& Path, std::string& Err);
 
-void* DLSym(const std::string& Name, std::string* Err = nullptr);
+void* DLSym(const std::string& Name, std::string& Err);
 
 ///\brief Close a handle to a shared library.
 ///
@@ -58,7 +58,7 @@ void* DLSym(const std::string& Name, std::string* Err = nullptr);
 ///
 /// \returns the library handle
 ///
-void DLClose(void* Lib, std::string* Err = nullptr);
+void DLClose(void* Lib, std::string& Err);
 } // namespace platform
 
 ///\brief Replace all $TOKENS in a string with environent variable values.

diff --git a/unittests/CppInterOp/DynamicLibraryManagerTest.cpp b/unittests/CppInterOp/DynamicLibraryManagerTest.cpp
@@ -5,6 +5,8 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
+#include "../../lib/Interpreter/Paths.h"
+
 // This function isn't referenced outside its translation unit, but it
 // can't use the "static" keyword because its address is used for
 // GetMainExecutable (since some platforms don't support taking the
@@ -54,3 +56,10 @@ TEST(DynamicLibraryManagerTest, Sanity) {
   // invalidated...
   // EXPECT_FALSE(Cpp::GetFunctionAddress("ret_zero"));
 }
+
+TEST(UtilsPlatform, DLTest) {
+  std::string err_ = "";
+  auto dlopen_handle = Cpp::utils::platform::DLOpen(
+      "./unittests/CppInterOp/libTestSharedLib.dylib", err_);
+  (void)dlopen_handle;
+}