[llvm] r278069 - Revert r278065 while I investigate some build-bot breakage.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 8 15:57:30 PDT 2016
Author: lhames
Date: Mon Aug 8 17:57:30 2016
New Revision: 278069
URL: http://llvm.org/viewvc/llvm-project?rev=278069&view=rev
Log:
Revert r278065 while I investigate some build-bot breakage.
Removed:
llvm/trunk/test/ExecutionEngine/MCJIT/Inputs/weak-function-2.ll
llvm/trunk/test/ExecutionEngine/MCJIT/weak-function.ll
llvm/trunk/test/ExecutionEngine/OrcMCJIT/Inputs/weak-function-2.ll
llvm/trunk/test/ExecutionEngine/OrcMCJIT/weak-function.ll
Modified:
llvm/trunk/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
Modified: llvm/trunk/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h?rev=278069&r1=278068&r2=278069&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h (original)
+++ llvm/trunk/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h Mon Aug 8 17:57:30 2016
@@ -116,13 +116,11 @@ class OrcMCJITReplacement : public Execu
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:
Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp?rev=278069&r1=278068&r2=278069&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp Mon Aug 8 17:57:30 2016
@@ -226,24 +226,6 @@ RuntimeDyldImpl::loadObjectImpl(const ob
// 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;
Removed: llvm/trunk/test/ExecutionEngine/MCJIT/Inputs/weak-function-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/Inputs/weak-function-2.ll?rev=278068&view=auto
==============================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/Inputs/weak-function-2.ll (original)
+++ llvm/trunk/test/ExecutionEngine/MCJIT/Inputs/weak-function-2.ll (removed)
@@ -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*)
-}
Removed: llvm/trunk/test/ExecutionEngine/MCJIT/weak-function.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/weak-function.ll?rev=278068&view=auto
==============================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/weak-function.ll (original)
+++ llvm/trunk/test/ExecutionEngine/MCJIT/weak-function.ll (removed)
@@ -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
-}
-
Removed: llvm/trunk/test/ExecutionEngine/OrcMCJIT/Inputs/weak-function-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/OrcMCJIT/Inputs/weak-function-2.ll?rev=278068&view=auto
==============================================================================
--- llvm/trunk/test/ExecutionEngine/OrcMCJIT/Inputs/weak-function-2.ll (original)
+++ llvm/trunk/test/ExecutionEngine/OrcMCJIT/Inputs/weak-function-2.ll (removed)
@@ -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*)
-}
Removed: llvm/trunk/test/ExecutionEngine/OrcMCJIT/weak-function.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/OrcMCJIT/weak-function.ll?rev=278068&view=auto
==============================================================================
--- llvm/trunk/test/ExecutionEngine/OrcMCJIT/weak-function.ll (original)
+++ llvm/trunk/test/ExecutionEngine/OrcMCJIT/weak-function.ll (removed)
@@ -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
-}
-
More information about the llvm-commits
mailing list