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

jit: Remove old crate loading code and don't search through loaded crates (use llvm default instead)

Browse source
This commit is contained in:
Zack Corr 2012-09-28 18:05:49 +10:00
parent ca4455666e
commit b3f418c10e
2 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/rustllvm/RustWrapper.cpp
View file

@ -282,17 +282,7 @@ void *RustMCJITMemoryManager::getPointerToNamedFunction(const std::string &Name,
const char *NameStr = Name.c_str();
// Look through loaded crates for symbols.
for (DenseSet<DynamicLibrary*>::iterator I = crates.begin(),
E = crates.end(); I != E; ++I) {
void *Ptr = (*I)->getAddressOfSymbol(NameStr);
if (Ptr) return Ptr;
}
// Fallback to using any symbols LLVM has loaded (generally
// from the main program).
// Look through loaded crates and main for symbols.
void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr);
if (Ptr) return Ptr;
@ -365,6 +355,7 @@ LLVMRustExecuteJIT(void* mem,
PM->run(*unwrap(M));
ExecutionEngine* EE = EngineBuilder(unwrap(M))
.setErrorStr(&Err)
.setTargetOptions(Options)
.setJITMemoryManager(MM)
.setOptLevel(OptLevel)