From 19adece68b00bd1873499cca6f1537750608d769 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 13 Jun 2013 12:40:22 -0700
Subject: Revert "Have JIT execution take ownership of the LLVMContextRef"

This reverts commit 5c5095d25e3652c434c8d4ec178e6844877e3c2d.

Conflicts:
	src/librusti/rusti.rc
---
 src/rustllvm/RustWrapper.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/rustllvm/RustWrapper.cpp')

diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 30e01b53ab7..17eb0f50b9b 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -329,12 +329,12 @@ LLVMRustLoadCrate(void* mem, const char* crate) {
   return true;
 }
 
-extern "C" LLVMExecutionEngineRef
-LLVMRustBuildJIT(void* mem,
-                 LLVMPassManagerRef PMR,
-                 LLVMModuleRef M,
-                 CodeGenOpt::Level OptLevel,
-                 bool EnableSegmentedStacks) {
+extern "C" void*
+LLVMRustExecuteJIT(void* mem,
+                   LLVMPassManagerRef PMR,
+                   LLVMModuleRef M,
+                   CodeGenOpt::Level OptLevel,
+                   bool EnableSegmentedStacks) {
 
   InitializeNativeTarget();
   InitializeNativeTargetAsmPrinter();
@@ -371,15 +371,21 @@ LLVMRustBuildJIT(void* mem,
 
   if(!EE || Err != "") {
     LLVMRustError = Err.c_str();
-    // The EngineBuilder only takes ownership of these two structures if the
-    // create() call is successful, but here it wasn't successful.
-    LLVMDisposeModule(M);
-    delete MM;
-    return NULL;
+    return 0;
   }
 
   MM->invalidateInstructionCache();
-  return wrap(EE);
+  Function* func = EE->FindFunctionNamed("_rust_main");
+
+  if(!func || Err != "") {
+    LLVMRustError = Err.c_str();
+    return 0;
+  }
+
+  void* entry = EE->getPointerToFunction(func);
+  assert(entry);
+
+  return entry;
 }
 
 extern "C" bool
-- 
cgit 1.4.1-3-g733a5