Eliminate the dependency of ExecutionEngine on the JIT/Interpreter libraries.
Now you can build a tool with just the JIT or just the interpreter.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26946 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.cpp b/lib/ExecutionEngine/Interpreter/Interpreter.cpp
index af23bf1..0f73189 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.cpp
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.cpp
@@ -17,11 +17,24 @@
#include "llvm/CodeGen/IntrinsicLowering.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Module.h"
+#include "llvm/ModuleProvider.h"
using namespace llvm;
+static struct RegisterInterp {
+ RegisterInterp() { Interpreter::Register(); }
+} InterpRegistrator;
+
/// create - Create a new interpreter object. This can never fail.
///
-ExecutionEngine *Interpreter::create(Module *M, IntrinsicLowering *IL) {
+ExecutionEngine *Interpreter::create(ModuleProvider *MP,
+ IntrinsicLowering *IL) {
+ Module *M;
+ try {
+ M = MP->materializeModule();
+ } catch (...) {
+ return 0; // error materializing the module.
+ }
+
bool isLittleEndian = false;
switch (M->getEndianness()) {
case Module::LittleEndian: isLittleEndian = true; break;
diff --git a/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h
index e45b4c6..1b547a6 100644
--- a/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -102,11 +102,15 @@
///
void runAtExitHandlers();
+ static void Register() {
+ InterpCtor = create;
+ }
+
/// create - Create an interpreter ExecutionEngine. This can never fail. The
/// specified IntrinsicLowering implementation will be deleted when the
/// Interpreter execution engine is destroyed.
///
- static ExecutionEngine *create(Module *M, IntrinsicLowering *IL);
+ static ExecutionEngine *create(ModuleProvider *M, IntrinsicLowering *IL);
/// run - Start execution with the specified function and arguments.
///