maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a thinko in the JIT where the address of a GV was only recorded in the map 

on failure to resolve it.
Do not abort on failure to resolve an external symbol when using dlsym stubs,
  since the symbol may not be in the JIT's address space.  Just use 0.
Allow dlsym stubs to differentiate between GlobalVars and Functions.

llvm-svn: 66050
This commit is contained in:
Nate Begeman 2009-03-04 19:10:38 +00:00
parent 8473a12bfe
commit 920438ef1d
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/ExecutionEngine/JIT/JIT.cpp
View File

@ -609,12 +609,12 @@ void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
return (void*)&__dso_handle;
#endif
Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(GV->getName().c_str());
if (Ptr == 0) {
if (Ptr == 0 && !areDlsymStubsEnabled()) {
cerr << "Could not resolve external global address: "
<< GV->getName() << "\n";
abort();
addGlobalMapping(GV, Ptr);
}
addGlobalMapping(GV, Ptr);
} else {
// GlobalVariable's which are not "constant" will cause trouble in a server
// situation. It's returned in the same block of memory as code which may

18
llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
View File

@ -1348,12 +1348,22 @@ void JIT::updateDlsymStubTable() {
for (unsigned i = 0; i != GVs.size(); ++i)
MCE->emitInt32(Offsets[i]);
// Emit the pointers
for (unsigned i = 0; i != GVs.size(); ++i)
// Emit the pointers. Verify that they are at least 2-byte aligned, and set
// the low bit to 0 == GV, 1 == Function, so that the client code doing the
// relocation can write the relocated pointer at the appropriate place in
// the stub.
for (unsigned i = 0; i != GVs.size(); ++i) {
intptr_t Ptr = (intptr_t)Ptrs[i];
assert((Ptr & 1) == 0 && "Stub pointers must be at least 2-byte aligned!");
if (isa<Function>(GVs[i]))
Ptr |= (intptr_t)1;
if (sizeof(void *) == 8)
MCE->emitInt64((intptr_t)Ptrs[i]);
MCE->emitInt64(Ptr);
else
MCE->emitInt32((intptr_t)Ptrs[i]);
MCE->emitInt32(Ptr);
}
// Emit the strings
for (unsigned i = 0; i != GVs.size(); ++i)