From 1d560c20ffb7cc8c4e54d33e2bdeea6306e1e29f Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames@gmail.com>
Date: Wed, 23 May 2018 21:27:07 +0000
Subject: [PATCH] [LKH] Add a new IRTransformLayer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@333129 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../llvm/ExecutionEngine/Orc/IRTransformLayer.h    | 20 ++++++++++++-
 lib/ExecutionEngine/Orc/CMakeLists.txt             |  1 +
 lib/ExecutionEngine/Orc/IRTransformLayer.cpp       | 34 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 lib/ExecutionEngine/Orc/IRTransformLayer.cpp

diff --git a/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h b/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
index 5539b415ec2..a802b6db6dd 100644
--- a/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
+++ b/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
@@ -15,7 +15,7 @@
 #define LLVM_EXECUTIONENGINE_ORC_IRTRANSFORMLAYER_H
 
 #include "llvm/ExecutionEngine/JITSymbol.h"
-#include "llvm/ExecutionEngine/Orc/Core.h"
+#include "llvm/ExecutionEngine/Orc/Layer.h"
 #include <memory>
 #include <string>
 
@@ -23,6 +23,24 @@ namespace llvm {
 class Module;
 namespace orc {
 
+class IRTransformLayer2 : public IRLayer {
+public:
+
+  using TransformFunction =
+    std::function<Expected<std::unique_ptr<Module>>(std::unique_ptr<Module>)>;
+
+  IRTransformLayer2(ExecutionSession &ES,
+                    IRLayer &BaseLayer,
+                    TransformFunction Transform);
+
+  void emit(MaterializationResponsibility R, VModuleKey K,
+            std::unique_ptr<Module> M) override;
+
+private:
+  IRLayer &BaseLayer;
+  TransformFunction Transform;
+};
+
 /// IR mutating layer.
 ///
 ///   This layer applies a user supplied transform to each module that is added,
diff --git a/lib/ExecutionEngine/Orc/CMakeLists.txt b/lib/ExecutionEngine/Orc/CMakeLists.txt
index 1f349682e08..b6469501925 100644
--- a/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ b/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -3,6 +3,7 @@ add_llvm_library(LLVMOrcJIT
   ExecutionUtils.cpp
   IndirectionUtils.cpp
   IRCompileLayer.cpp
+  IRTransformLayer.cpp
   Legacy.cpp
   Layer.cpp
   NullResolver.cpp
diff --git a/lib/ExecutionEngine/Orc/IRTransformLayer.cpp b/lib/ExecutionEngine/Orc/IRTransformLayer.cpp
new file mode 100644
index 00000000000..4dd3cfdfe38
--- /dev/null
+++ b/lib/ExecutionEngine/Orc/IRTransformLayer.cpp
@@ -0,0 +1,34 @@
+//===-------------- IRTransformLayer.cpp - IR 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/IRTransformLayer.h"
+#include "llvm/Support/MemoryBuffer.h"
+
+namespace llvm {
+namespace orc {
+
+IRTransformLayer2::IRTransformLayer2(ExecutionSession &ES,
+                                     IRLayer &BaseLayer,
+                                     TransformFunction Transform)
+    : IRLayer(ES), BaseLayer(BaseLayer), Transform(std::move(Transform)) {}
+
+void IRTransformLayer2::emit(MaterializationResponsibility R, VModuleKey K,
+                             std::unique_ptr<Module> M) {
+  assert(M && "Module must not be null");
+
+  if (auto TransformedMod = Transform(std::move(M)))
+    BaseLayer.emit(std::move(R), std::move(K), std::move(*TransformedMod));
+  else {
+    R.failMaterialization();
+    getExecutionSession().reportError(TransformedMod.takeError());
+  }
+}
+
+} // End namespace orc.
+} // End namespace llvm.
-- 
2.11.0