diff options
| author | Lang Hames <lhames@gmail.com> | 2018-01-16 20:39:51 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2018-01-16 20:39:51 +0000 |
| commit | 4a793c06676feb4f8e27c9f347bf2487670b71cc (patch) | |
| tree | 49dae43e1284976f418e4e7a24a06879e068f62f /llvm | |
| parent | cc64266f53458154225fcf89e41682138628e906 (diff) | |
| download | bcm5719-llvm-4a793c06676feb4f8e27c9f347bf2487670b71cc.tar.gz bcm5719-llvm-4a793c06676feb4f8e27c9f347bf2487670b71cc.zip | |
[ExecutionEngine] Rename JITSymbol::isStrongDefinition to isStrong.
For symmetry with isWeak, isCommon.
llvm-svn: 322594
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/ExecutionEngine/JITSymbol.h | 2 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/Core.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/llvm/include/llvm/ExecutionEngine/JITSymbol.h b/llvm/include/llvm/ExecutionEngine/JITSymbol.h index 77f577d74f1..d171f998e6f 100644 --- a/llvm/include/llvm/ExecutionEngine/JITSymbol.h +++ b/llvm/include/llvm/ExecutionEngine/JITSymbol.h @@ -89,7 +89,7 @@ public: } /// @brief Returns true if the symbol isn't weak or common. - bool isStrongDefinition() const { + bool isStrong() const { return !isWeak() && !isCommon(); } 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); |

