Update changes with the llvms PR

Author: SahilPatidar

interpreter/cling/include/cling/Interpreter/DynamicLibraryManager.h

@@ -10,7 +10,7 @@
 #ifndef CLING_DYNAMIC_LIBRARY_MANAGER_H
 #define CLING_DYNAMIC_LIBRARY_MANAGER_H
 
-#include "llvm/ExecutionEngine/Orc/Shared/DynamicLoader.h"
+#include "llvm/ExecutionEngine/Orc/Shared/LibraryResolver.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
@@ -131,9 +131,9 @@ namespace cling {
               return;
           auto pos = prepend ? m_SearchPaths.begin() : m_SearchPaths.end();
           m_SearchPaths.insert(pos, SearchPathInfo{dir.str(), isUser});
-          m_DyldController->addScanPath(dir.str(),
-                                        isUser ? llvm::orc::PathType::User
-                                               : llvm::orc::PathType::System);
+          // m_DyldController->addScanPath(dir.str(),
+          //                               isUser ? llvm::orc::PathType::User
+          //                                      : llvm::orc::PathType::System);
        }
     }
 

interpreter/cling/lib/Interpreter/DynamicLibraryManager.cpp

@@ -44,8 +44,8 @@ namespace cling {
   #endif
     };
 
-    m_DyldController = llvm::orc::LibraryResolutionDriver::create(
-        llvm::orc::LibraryResolver::Setup::create({}));
+    // m_DyldController = llvm::orc::LibraryResolutionDriver::create(
+    //     llvm::orc::LibraryResolver::Setup::create({}));
 
     // Behaviour is to not add paths that don't exist...In an interpreted env
     // does this make sense? Path could pop into existance at any time.
@@ -396,7 +396,8 @@ namespace cling {
     if (!insRes.second)
       return kLoadLibAlreadyLoaded;
     m_LoadedLibraries.insert(canonicalLoadedLib);
-    m_DyldController->markLibraryLoaded(canonicalLoadedLib);
+    if (m_DyldController)
+      m_DyldController->markLibraryLoaded(canonicalLoadedLib);
     return kLoadLibSuccess;
   }
 
@@ -428,7 +429,8 @@ namespace cling {
 
     m_DyLibs.erase(dyLibHandle);
     m_LoadedLibraries.erase(canonicalLoadedLib);
-    m_DyldController->markLibraryUnLoaded(canonicalLoadedLib);
+    if (m_DyldController)
+      m_DyldController->markLibraryUnLoaded(canonicalLoadedLib);
   }
 
   bool DynamicLibraryManager::isLibraryLoaded(llvm::StringRef fullPath) const {

interpreter/cling/lib/Interpreter/DynamicLibraryManagerSymbol.cpp

@@ -1335,28 +1335,43 @@ namespace cling {
   }
 
   DynamicLibraryManager::~DynamicLibraryManager() {
-    static_assert(sizeof(Dyld) > 0, "Incomplete type");
-    delete m_Dyld;
+    // static_assert(sizeof(Dyld) > 0, "Incomplete type");
+    // delete m_Dyld;
   }
 
   void DynamicLibraryManager::initializeDyld(
                  std::function<bool(llvm::StringRef)> shouldPermanentlyIgnore) {
      //assert(!m_Dyld && "Already initialized!");
-    if (m_Dyld)
-      delete m_Dyld;
+    if (m_DyldController)
+      m_DyldController.reset();
+
+    llvm::orc::LibraryResolver::Setup S =
+        llvm::orc::LibraryResolver::Setup::create({});
+    S.shouldScan = shouldPermanentlyIgnore;
+    m_DyldController = llvm::orc::LibraryResolutionDriver::create(S);
+
+    for (const auto& info : m_SearchPaths) {
+      m_DyldController->addScanPath(info.Path,
+                                    info.IsUser ? llvm::orc::PathType::User
+                                                : llvm::orc::PathType::System);
+    }
+
+    for (const auto& lib : m_LoadedLibraries) {
+      m_DyldController->markLibraryLoaded(lib.first());
+    }
 
-    std::string exeP = GetExecutablePath();
-    auto ObjF =
-      cantFail(llvm::object::ObjectFile::createObjectFile(exeP));
+    // std::string exeP = GetExecutablePath();
+    // auto ObjF =
+    //   cantFail(llvm::object::ObjectFile::createObjectFile(exeP));
 
-    m_Dyld = new Dyld(*this, shouldPermanentlyIgnore,
-                      ObjF.getBinary()->getFileFormatName());
+    // m_Dyld = new Dyld(*this, shouldPermanentlyIgnore,
+    //                   ObjF.getBinary()->getFileFormatName());
   }
 
   std::string
   DynamicLibraryManager::searchLibrariesForSymbol(StringRef mangledName,
                                            bool searchSystem/* = true*/) const {
-    assert(m_Dyld && "Must call initialize dyld before!");
+    assert(m_DyldController && "Must call initialize dyld before!");
     std::string res = "";
     std::vector<std::string> sym;
     sym.push_back(mangledName.str());
@@ -1368,13 +1383,17 @@ namespace cling {
           llvm::orc::PathType::System},
          {llvm::orc::LibraryManager::State::Unloaded,
           llvm::orc::PathType::System}}};
+    llvm::orc::SearchConfig config;
+    config.policy = policy;
+    config.options.FilterFlags =
+        llvm::orc::SymbolEnumeratorOptions::IgnoreUndefined;
     m_DyldController->resolveSymbols(
         sym,
         [&](llvm::orc::LibraryResolver::SymbolQuery& Q) {
           if (auto s = Q.getResolvedLib(mangledName))
             res = *s;
         },
-        policy);
+        config);
     return res;
     // return m_Dyld->searchLibrariesForSymbol(mangledName, searchSystem);
   }