diff options
Diffstat (limited to 'llvm/lib/ExecutionEngine')
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/Core.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/Core.cpp b/llvm/lib/ExecutionEngine/Orc/Core.cpp index 2c6da83ea3c..2af24a09ae3 100644 --- a/llvm/lib/ExecutionEngine/Orc/Core.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Core.cpp @@ -190,13 +190,13 @@ VSO::RelativeLinkageStrength VSO::compareLinkage(Optional<JITSymbolFlags> Old, if (Old == None) return llvm::orc::VSO::NewDefinitionIsStronger; - if (Old->isStrongDefinition()) { - if (New.isStrongDefinition()) + if (Old->isStrong()) { + if (New.isStrong()) return llvm::orc::VSO::DuplicateDefinition; else return llvm::orc::VSO::ExistingDefinitionIsStronger; } else { - if (New.isStrongDefinition()) + if (New.isStrong()) return llvm::orc::VSO::NewDefinitionIsStronger; else return llvm::orc::VSO::ExistingDefinitionIsStronger; diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index c5e4dfa1e53..3a025f4c026 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -247,7 +247,7 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) { // 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()) + if (Sym.getFlags().isStrong()) continue; } else if (auto Err = Sym.takeError()) return std::move(Err); |
