From 85642262b2ca7cff8cf7ad225a75b005576b162f Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Wed, 23 May 2018 21:27:06 +0000 Subject: [PATCH] [LKH] Add ObjectTransformLayer2. llvm-svn: 333128 --- .../Orc/ObjectTransformLayer.h | 19 ++++++++++- llvm/lib/ExecutionEngine/Orc/CMakeLists.txt | 1 + .../Orc/ObjectTransformLayer.cpp | 34 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 llvm/lib/ExecutionEngine/Orc/ObjectTransformLayer.cpp diff --git a/llvm/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h index 2829e32f2c8d..c6b43a9c8ed6 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h @@ -15,7 +15,7 @@ #define LLVM_EXECUTIONENGINE_ORC_OBJECTTRANSFORMLAYER_H #include "llvm/ExecutionEngine/JITSymbol.h" -#include "llvm/ExecutionEngine/Orc/Core.h" +#include "llvm/ExecutionEngine/Orc/Layer.h" #include #include #include @@ -23,6 +23,23 @@ namespace llvm { namespace orc { +class ObjectTransformLayer2 : public ObjectLayer { +public: + using TransformFunction = + std::function>( + std::unique_ptr)>; + + ObjectTransformLayer2(ExecutionSession &ES, ObjectLayer &BaseLayer, + TransformFunction Transform); + + void emit(MaterializationResponsibility R, VModuleKey K, + std::unique_ptr O) override; + +private: + ObjectLayer &BaseLayer; + TransformFunction Transform; +}; + /// Object mutating layer. /// /// This layer accepts sets of ObjectFiles (via addObject). It diff --git a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt index 5b94ae990bea..1f349682e086 100644 --- a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt @@ -6,6 +6,7 @@ add_llvm_library(LLVMOrcJIT Legacy.cpp Layer.cpp NullResolver.cpp + ObjectTransformLayer.cpp OrcABISupport.cpp OrcCBindings.cpp OrcError.cpp diff --git a/llvm/lib/ExecutionEngine/Orc/ObjectTransformLayer.cpp b/llvm/lib/ExecutionEngine/Orc/ObjectTransformLayer.cpp new file mode 100644 index 000000000000..6980c8140fd0 --- /dev/null +++ b/llvm/lib/ExecutionEngine/Orc/ObjectTransformLayer.cpp @@ -0,0 +1,34 @@ +//===---------- ObjectTransformLayer.cpp - Object Transform Layer ---------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "llvm/ExecutionEngine/Orc/ObjectTransformLayer.h" +#include "llvm/Support/MemoryBuffer.h" + +namespace llvm { +namespace orc { + +ObjectTransformLayer2::ObjectTransformLayer2(ExecutionSession &ES, + ObjectLayer &BaseLayer, + TransformFunction Transform) + : ObjectLayer(ES), BaseLayer(BaseLayer), Transform(std::move(Transform)) {} + +void ObjectTransformLayer2::emit(MaterializationResponsibility R, VModuleKey K, + std::unique_ptr O) { + assert(O && "Module must not be null"); + + if (auto TransformedObj = Transform(std::move(O))) + BaseLayer.emit(std::move(R), std::move(K), std::move(*TransformedObj)); + else { + R.failMaterialization(); + getExecutionSession().reportError(TransformedObj.takeError()); + } +} + +} // End namespace orc. +} // End namespace llvm.