[mlir][orc] unbreak MLIR ExecutionEngine after ORC changes

Changes to ORC in ce2207abaf changed the
APIs in IRCompileLayer, now requiring the custom compiler to be wrapped
in IRCompileLayer::IRCompiler. Even though MLIR relies on Orc
CompileUtils, the type is still visible in several places in the code.
Adapt those to the new API.
This commit is contained in:
Alex Zinenko 2020-01-22 10:12:04 +01:00
parent 0157a74bec
commit 7984b47401
1 changed files with 3 additions and 3 deletions

View File

@ -256,14 +256,14 @@ Expected<std::unique_ptr<ExecutionEngine>> ExecutionEngine::create(
// Callback to inspect the cache and recompile on demand. This follows Lang's
// LLJITWithObjectCache example.
auto compileFunctionCreator = [&](JITTargetMachineBuilder JTMB)
-> Expected<IRCompileLayer::CompileFunction> {
-> Expected<std::unique_ptr<IRCompileLayer::IRCompiler>> {
if (jitCodeGenOptLevel)
JTMB.setCodeGenOptLevel(jitCodeGenOptLevel.getValue());
auto TM = JTMB.createTargetMachine();
if (!TM)
return TM.takeError();
return IRCompileLayer::CompileFunction(
TMOwningSimpleCompiler(std::move(*TM), engine->cache.get()));
return std::make_unique<TMOwningSimpleCompiler>(std::move(*TM),
engine->cache.get());
};
// Create the LLJIT by calling the LLJITBuilder with 2 callbacks.