[examples] Fix Tapir Kaleidoscope example to use new pass manager and…

… updated OrcJIT interface.
OpenCilk · Jan 13, 2024 · 258b8d2 · 258b8d2
1 parent 13eab3e
commit 258b8d2
Show file tree

Hide file tree

Showing 2 changed files with 204 additions and 96 deletions.
diff --git a/llvm/examples/Kaleidoscope/Tapir/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/Tapir/KaleidoscopeJIT.h
@@ -23,6 +23,7 @@
 #include "llvm/ExecutionEngine/Orc/IRTransformLayer.h"
 #include "llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h"
 #include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
+#include "llvm/ExecutionEngine/Orc/Shared/ExecutorSymbolDef.h"
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/IRBuilder.h"
@@ -181,20 +182,20 @@ class KaleidoscopeJIT {
       return LookupResult.takeError();
 
     // Collect the addresses of those symbols.
-    std::vector<JITTargetAddress> Initializers;
+    std::vector<ExecutorAddr> Initializers;
     auto InitsItr = LookupResult->find(&MainJD);
     for (auto &KV : InitsItr->second)
       Initializers.push_back(KV.second.getAddress());
 
     // Run all initializer functions.
     for (auto InitFnAddr : Initializers) {
-      auto *InitFn = jitTargetAddressToFunction<void (*)()>(InitFnAddr);
+      auto *InitFn = InitFnAddr.toPtr<void (*)()>();
       InitFn();
     }
     return Error::success();
   }
 
-  Expected<JITEvaluatedSymbol> lookup(StringRef Name) {
+  Expected<ExecutorSymbolDef> lookup(StringRef Name) {
     return ES->lookup({&MainJD}, Mangle(Name.str()));
   }
 };