mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-28 04:33:05 +00:00
Reinstate r91208 to fix available_externally linkage for globals, with
nlewycky's fix to add -rdynamic so the JIT can look symbols up in Linux builds of the JITTests binary. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91250 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
c4174d675b
commit
898e9df8db
@ -681,7 +681,7 @@ void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
|
||||
if (Ptr) return Ptr;
|
||||
|
||||
// If the global is external, just remember the address.
|
||||
if (GV->isDeclaration()) {
|
||||
if (GV->isDeclaration() || GV->hasAvailableExternallyLinkage()) {
|
||||
#if HAVE___DSO_HANDLE
|
||||
if (GV->getName() == "__dso_handle")
|
||||
return (void*)&__dso_handle;
|
||||
|
@ -534,6 +534,31 @@ TEST_F(JITTest, FunctionPointersOutliveTheirCreator) {
|
||||
#endif
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
// This variable is intentionally defined differently in the statically-compiled
|
||||
// program from the IR input to the JIT to assert that the JIT doesn't use its
|
||||
// definition.
|
||||
extern "C" int32_t JITTest_AvailableExternallyGlobal;
|
||||
int32_t JITTest_AvailableExternallyGlobal = 42;
|
||||
namespace {
|
||||
|
||||
TEST_F(JITTest, AvailableExternallyGlobalIsntEmitted) {
|
||||
TheJIT->DisableLazyCompilation(true);
|
||||
LoadAssembly("@JITTest_AvailableExternallyGlobal = "
|
||||
" available_externally global i32 7 "
|
||||
" "
|
||||
"define i32 @loader() { "
|
||||
" %result = load i32* @JITTest_AvailableExternallyGlobal "
|
||||
" ret i32 %result "
|
||||
"} ");
|
||||
Function *loaderIR = M->getFunction("loader");
|
||||
|
||||
int32_t (*loader)() = reinterpret_cast<int32_t(*)()>(
|
||||
(intptr_t)TheJIT->getPointerToFunction(loaderIR));
|
||||
EXPECT_EQ(42, loader()) << "func should return 42 from the external global,"
|
||||
<< " not 7 from the IR version.";
|
||||
}
|
||||
|
||||
// This code is copied from JITEventListenerTest, but it only runs once for all
|
||||
// the tests in this directory. Everything seems fine, but that's strange
|
||||
// behavior.
|
||||
|
@ -13,3 +13,6 @@ LINK_COMPONENTS := asmparser core support jit native
|
||||
|
||||
include $(LEVEL)/Makefile.config
|
||||
include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
|
||||
|
||||
# Permit these tests to use the JIT's symbolic lookup.
|
||||
LD.Flags += $(RDYNAMIC)
|
||||
|
Loading…
Reference in New Issue
Block a user