Fix initialization setup issue

Author: SahilPatidar

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

@@ -131,9 +131,10 @@ 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);
+          if (m_DyldController)
+            m_DyldController->addScanPath(dir.str(),
+                                          isUser ? llvm::orc::PathType::User
+                                                 : llvm::orc::PathType::System);
        }
     }
 

interpreter/cling/lib/Interpreter/DynamicLibraryManagerSymbol.cpp

@@ -1341,14 +1341,20 @@ namespace cling {
 
   void DynamicLibraryManager::initializeDyld(
                  std::function<bool(llvm::StringRef)> shouldPermanentlyIgnore) {
-     //assert(!m_Dyld && "Already initialized!");
+    //  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 = [&](llvm::StringRef lib) -> bool {
-      return !shouldPermanentlyIgnore(lib);
+    S.shouldScan = [&, shouldPermanentlyIgnore](llvm::StringRef lib) -> bool {
+      if (shouldPermanentlyIgnore) {
+        return !shouldPermanentlyIgnore(lib) || !isLibraryLoaded(lib);
+      }
+      // fallback behavior if no callback provided
+      return !isLibraryLoaded(lib);
     };
     m_DyldController = llvm::orc::LibraryResolutionDriver::create(S);
 
@@ -1377,16 +1383,15 @@ namespace cling {
     std::string res = "";
     std::vector<std::string> sym;
     sym.push_back(mangledName.str());
-    llvm::orc::SearchPolicy policy = {
+    llvm::orc::SearchConfig config;
+    config.policy = {
         {{llvm::orc::LibraryManager::State::Queried, llvm::orc::PathType::User},
          {llvm::orc::LibraryManager::State::Unloaded,
           llvm::orc::PathType::User},
          {llvm::orc::LibraryManager::State::Queried,
           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(

interpreter/llvm-project/llvm/lib/ExecutionEngine/Orc/Shared/LibraryScanner.cpp

@@ -69,6 +69,7 @@ bool ObjectFileLoader::isArchitectureCompatible(const object::ObjectFile &Obj) {
     return false;
 
   if (ObjTriple.getEnvironment() != Triple::UnknownEnvironment &&
+      HostTriple.getEnvironment() != Triple::UnknownEnvironment &&
       HostTriple.getEnvironment() != ObjTriple.getEnvironment())
     return false;