bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Revert "Have JIT execution take ownership of the LLVMContextRef"

Browse source 
This reverts commit 5c5095d25e.

Conflicts:
	src/librusti/rusti.rc
This commit is contained in:
Brian Anderson 2013-06-13 12:40:22 -07:00
parent 5bff471dde
commit 19adece68b
8 changed files with 61 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/rustllvm/RustWrapper.cpp
View file

@ -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