[Mlir-commits] [mlir] 557a0ea - [mlir] Update JitRunner, ExecutionEngine after LLVM commit 8b1771bd9f3.

[Lang Hames]

Author: Lang Hames
Date: 2023-03-27T19:18:04-07:00
New Revision: 557a0ea8aff31de1cc337bd3819f015338f7d553

URL: https://github.com/llvm/llvm-project/commit/557a0ea8aff31de1cc337bd3819f015338f7d553
DIFF: https://github.com/llvm/llvm-project/commit/557a0ea8aff31de1cc337bd3819f015338f7d553.diff

LOG: [mlir] Update JitRunner, ExecutionEngine after LLVM commit 8b1771bd9f3.

LLVM commit 8b1771bd9f3 replaced JITEvaluatedSymbol with ExecutorSymbolDef.

Added: 
    

Modified: 
    mlir/lib/CAPI/ExecutionEngine/ExecutionEngine.cpp
    mlir/lib/ExecutionEngine/JitRunner.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/lib/CAPI/ExecutionEngine/ExecutionEngine.cpp b/mlir/lib/CAPI/ExecutionEngine/ExecutionEngine.cpp
index a0ea7f4abcfde..1075ec46030c0 100644
--- a/mlir/lib/CAPI/ExecutionEngine/ExecutionEngine.cpp
+++ b/mlir/lib/CAPI/ExecutionEngine/ExecutionEngine.cpp
@@ -104,7 +104,8 @@ extern "C" void mlirExecutionEngineRegisterSymbol(MlirExecutionEngine jit,
   unwrap(jit)->registerSymbols([&](llvm::orc::MangleAndInterner interner) {
     llvm::orc::SymbolMap symbolMap;
     symbolMap[interner(unwrap(name))] =
-        llvm::JITEvaluatedSymbol::fromPointer(sym);
+        { llvm::orc::ExecutorAddr::fromPtr(sym),
+          llvm::JITSymbolFlags::Exported };
     return symbolMap;
   });
 }

diff  --git a/mlir/lib/ExecutionEngine/JitRunner.cpp b/mlir/lib/ExecutionEngine/JitRunner.cpp
index bd069a1ea760d..e1c5d957936a3 100644
--- a/mlir/lib/ExecutionEngine/JitRunner.cpp
+++ b/mlir/lib/ExecutionEngine/JitRunner.cpp
@@ -220,7 +220,8 @@ static Error compileAndExecute(Options &options, Operation *module,
                                              : llvm::orc::SymbolMap();
     for (auto &exportSymbol : exportSymbols)
       symbolMap[interner(exportSymbol.getKey())] =
-          llvm::JITEvaluatedSymbol::fromPointer(exportSymbol.getValue());
+          { llvm::orc::ExecutorAddr::fromPtr(exportSymbol.getValue()),
+            llvm::JITSymbolFlags::Exported };
     return symbolMap;
   };