[ExecutionEngine] Rename JITSymbol::isStrongDefinition to isStrong.
For symmetry with isWeak, isCommon. llvm-svn: 322594
This commit is contained in:
parent
cc64266f53
commit
4a793c0667
|
@ -89,7 +89,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @brief Returns true if the symbol isn't weak or common.
|
/// @brief Returns true if the symbol isn't weak or common.
|
||||||
bool isStrongDefinition() const {
|
bool isStrong() const {
|
||||||
return !isWeak() && !isCommon();
|
return !isWeak() && !isCommon();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -190,13 +190,13 @@ VSO::RelativeLinkageStrength VSO::compareLinkage(Optional<JITSymbolFlags> Old,
|
||||||
if (Old == None)
|
if (Old == None)
|
||||||
return llvm::orc::VSO::NewDefinitionIsStronger;
|
return llvm::orc::VSO::NewDefinitionIsStronger;
|
||||||
|
|
||||||
if (Old->isStrongDefinition()) {
|
if (Old->isStrong()) {
|
||||||
if (New.isStrongDefinition())
|
if (New.isStrong())
|
||||||
return llvm::orc::VSO::DuplicateDefinition;
|
return llvm::orc::VSO::DuplicateDefinition;
|
||||||
else
|
else
|
||||||
return llvm::orc::VSO::ExistingDefinitionIsStronger;
|
return llvm::orc::VSO::ExistingDefinitionIsStronger;
|
||||||
} else {
|
} else {
|
||||||
if (New.isStrongDefinition())
|
if (New.isStrong())
|
||||||
return llvm::orc::VSO::NewDefinitionIsStronger;
|
return llvm::orc::VSO::NewDefinitionIsStronger;
|
||||||
else
|
else
|
||||||
return llvm::orc::VSO::ExistingDefinitionIsStronger;
|
return llvm::orc::VSO::ExistingDefinitionIsStronger;
|
||||||
|
|
|
@ -247,7 +247,7 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) {
|
||||||
// Then check the symbol resolver to see if there's a definition
|
// Then check the symbol resolver to see if there's a definition
|
||||||
// elsewhere in this logical dylib.
|
// elsewhere in this logical dylib.
|
||||||
if (auto Sym = Resolver.findSymbolInLogicalDylib(Name)) {
|
if (auto Sym = Resolver.findSymbolInLogicalDylib(Name)) {
|
||||||
if (Sym.getFlags().isStrongDefinition())
|
if (Sym.getFlags().isStrong())
|
||||||
continue;
|
continue;
|
||||||
} else if (auto Err = Sym.takeError())
|
} else if (auto Err = Sym.takeError())
|
||||||
return std::move(Err);
|
return std::move(Err);
|
||||||
|
|
Loading…
Reference in New Issue