RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Revert r278065 while I investigate some build-bot breakage.

Browse Source 
llvm-svn: 278069
This commit is contained in:
Lang Hames 2016-08-08 22:57:30 +00:00
parent 71e7bbfc8b
commit 6f6b12b688
6 changed files with 2 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
View File

@ -116,13 +116,11 @@ class OrcMCJITReplacement : public ExecutionEngine {
LinkingResolver(OrcMCJITReplacement &M) : M(M) {}
JITSymbol findSymbol(const std::string &Name) override {
return M.ClientResolver->findSymbol(Name);
return M.findMangledSymbol(Name);
}
JITSymbol findSymbolInLogicalDylib(const std::string &Name) override {
if (auto Sym = M.findMangledSymbol(Name))
return Sym;
return M.ClientResolver->findSymbolInLogicalDylib(Name);
return M.ClientResolver->findSymbol(Name);
}
private:

18
lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
View File

@ -226,24 +226,6 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) {
// Compute JIT symbol flags.
JITSymbolFlags JITSymFlags = JITSymbolFlags::fromObjectSymbol(*I);
// If this is a weak definition, check to see if there's a strong one.
// If there is, skip this symbol (we won't be providing it: the strong
// definition will). If there's no strong definition, make this definition
// strong.
if (JITSymFlags.isWeak()) {
// First check whether there's already a definition in this instance.
// FIXME: Override existing weak definitions with strong ones.
if (GlobalSymbolTable.count(Name))
continue;
// Then check the symbol resolver to see if there's a definition
// elsewhere in this logical dylib.
if (auto Sym = Resolver.findSymbolInLogicalDylib(Name))
if (Sym.getFlags().isStrongDefinition())
continue;
// else
JITSymFlags &= ~JITSymbolFlags::Weak;
}
if (Flags & SymbolRef::SF_Absolute &&
SymType != object::SymbolRef::ST_File) {
uint64_t Addr = 0;

9
test/ExecutionEngine/MCJIT/Inputs/weak-function-2.ll
View File

@ -1,9 +0,0 @@
define linkonce_odr i32 @baz() #0 {
entry:
ret i32 0
}
define i8* @bar() {
entry:
ret i8* bitcast (i32 ()* @baz to i8*)
}

26
test/ExecutionEngine/MCJIT/weak-function.ll
View File

@ -1,26 +0,0 @@
; RUN: lli -jit-kind=mcjit -extra-module %p/Inputs/weak-function-2.ll %s
;
; Check that functions in two different modules agree on the address of weak
; function 'baz'
define linkonce_odr i32 @baz() {
entry:
ret i32 0
}
define i8* @foo() {
entry:
ret i8* bitcast (i32 ()* @baz to i8*)
}
declare i8* @bar()
define i32 @main(i32 %argc, i8** %argv) {
entry:
%call = tail call i8* @foo()
%call1 = tail call i8* @bar()
%cmp = icmp ne i8* %call, %call1
%conv = zext i1 %cmp to i32
ret i32 %conv
}

9
test/ExecutionEngine/OrcMCJIT/Inputs/weak-function-2.ll
View File

@ -1,9 +0,0 @@
define linkonce_odr i32 @baz() #0 {
entry:
ret i32 0
}
define i8* @bar() {
entry:
ret i8* bitcast (i32 ()* @baz to i8*)
}

26
test/ExecutionEngine/OrcMCJIT/weak-function.ll
View File

@ -1,26 +0,0 @@
; RUN: lli -jit-kind=orc-mcjit -extra-module %p/Inputs/weak-function-2.ll %s
;
; Check that functions in two different modules agree on the address of weak
; function 'baz'
define linkonce_odr i32 @baz() {
entry:
ret i32 0
}
define i8* @foo() {
entry:
ret i8* bitcast (i32 ()* @baz to i8*)
}
declare i8* @bar()
define i32 @main(i32 %argc, i8** %argv) {
entry:
%call = tail call i8* @foo()
%call1 = tail call i8* @bar()
%cmp = icmp ne i8* %call, %call1
%conv = zext i1 %cmp to i32
ret i32 %conv
}