Merge with main branch

Author: SahilPatidar

llvm/include/llvm/ExecutionEngine/Orc/DylibManager.h

@@ -13,6 +13,7 @@
 #ifndef LLVM_EXECUTIONENGINE_ORC_DYLIBMANAGER_H
 #define LLVM_EXECUTIONENGINE_ORC_DYLIBMANAGER_H
 
+#include "llvm/ExecutionEngine/Orc/Shared/AutoLoadDylibUtils.h"
 #include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MSVCErrorWorkarounds.h"
@@ -60,6 +61,9 @@ class DylibManager {
   using SymbolLookupCompleteFn =
       unique_function<void(Expected<std::vector<tpctypes::LookupResult>>)>;
 
+  using ResolveSymbolsCompleteFn =
+      unique_function<void(Expected<std::vector<ResolveResult>>)>;
+
   /// Search for symbols in the target process.
   ///
   /// The result of the lookup is a 2-dimensional array of target addresses
@@ -68,6 +72,9 @@ class DylibManager {
   /// symbol is not found then it be assigned a '0' value.
   virtual void lookupSymbolsAsync(ArrayRef<LookupRequest> Request,
                                   SymbolLookupCompleteFn F) = 0;
+
+  virtual void resolveSymbolsAsync(ArrayRef<SymbolLookupSet> Request,
+                                   ResolveSymbolsCompleteFn F) = 0;
 };
 
 } // end namespace llvm::orc

llvm/include/llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h

@@ -104,7 +104,7 @@ class AutoLoadDynamicLibrarySearchGenerator : public DefinitionGenerator {
 
   Error
   tryToResolve(SymbolNameSet CandidateSyms,
-               ExecutorProcessControl::ResolveSymbolsCompleteFn OnCompleteFn);
+               DylibManager::ResolveSymbolsCompleteFn OnCompleteFn);
 
 private:
   ExecutorProcessControl &EPC;

llvm/include/llvm/ExecutionEngine/Orc/ExecutorProcessControl.h

@@ -16,7 +16,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h"
 #include "llvm/ExecutionEngine/Orc/DylibManager.h"
-#include "llvm/ExecutionEngine/Orc/Shared/AutoLoadDylibUtils.h"
 #include "llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h"
 #include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h"
 #include "llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h"

llvm/include/llvm/ExecutionEngine/Orc/SimpleRemoteEPC.h

@@ -122,6 +122,9 @@ class SimpleRemoteEPC : public ExecutorProcessControl,
   void lookupSymbolsAsync(ArrayRef<LookupRequest> Request,
                           SymbolLookupCompleteFn F) override;
 
+  void resolveSymbolsAsync(ArrayRef<SymbolLookupSet> Request,
+                           ResolveSymbolsCompleteFn F) override;
+
   using PendingCallWrapperResultsMap =
     DenseMap<uint64_t, IncomingWFRHandler>;
 

llvm/lib/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.cpp

@@ -172,7 +172,7 @@ Error AutoLoadDynamicLibrarySearchGenerator::tryToGenerate(
 
 Error AutoLoadDynamicLibrarySearchGenerator::tryToResolve(
     SymbolNameSet CandidateSyms,
-    ExecutorProcessControl::ResolveSymbolsCompleteFn OnCompleteFn) {
+    DylibManager::ResolveSymbolsCompleteFn OnCompleteFn) {
 
   LLVM_DEBUG({
     dbgs() << "AutoLoadDynamicLibrarySearchGenerator trying to resolve "
@@ -185,7 +185,7 @@ Error AutoLoadDynamicLibrarySearchGenerator::tryToResolve(
     LookupSymbols.add(S, SymbolLookupFlags::WeaklyReferencedSymbol);
   }
 
-  EPC.resolveSymbolsAsync(LookupSymbols, std::move(OnCompleteFn));
+  EPC.getDylibMgr().resolveSymbolsAsync(LookupSymbols, std::move(OnCompleteFn));
 
   return Error::success();
 }

llvm/lib/ExecutionEngine/Orc/SimpleRemoteEPC.cpp

@@ -61,7 +61,7 @@ static void
 resolveSymbolsAsyncHelper(EPCGenericDylibManager &DylibMgr,
                           ArrayRef<SymbolLookupSet> Request,
                           std::vector<ResolveResult> Result,
-                          SimpleRemoteEPC::ResolveSymbolsCompleteFn Complete) {
+                          DylibManager::ResolveSymbolsCompleteFn Complete) {
   if (Request.empty())
     return Complete(std::move(Result));
 
@@ -93,7 +93,7 @@ void SimpleRemoteEPC::lookupSymbolsAsync(ArrayRef<LookupRequest> Request,
 
 void SimpleRemoteEPC::resolveSymbolsAsync(ArrayRef<SymbolLookupSet> Request,
                                           ResolveSymbolsCompleteFn Complete) {
-  resolveSymbolsAsyncHelper(*DylibMgr, Request, {}, std::move(Complete));
+  resolveSymbolsAsyncHelper(*EPCDylibMgr, Request, {}, std::move(Complete));
 }
 
 Expected<int32_t> SimpleRemoteEPC::runAsMain(ExecutorAddr MainFnAddr,