maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Simplify visibility computation. NFC

This commit is contained in:
Fangrui Song 2022-09-04 16:38:27 -07:00
parent 498151d944
commit 86c35a54db
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/ELF/Symbols.cpp
View File

@ -367,14 +367,6 @@ bool elf::computeIsPreemptible(const Symbol &sym) {
return true; return true;
} }
static uint8_t getMinVisibility(uint8_t va, uint8_t vb) {
if (va == STV_DEFAULT)
return vb;
if (vb == STV_DEFAULT)
return va;
return std::min(va, vb);
}
// Merge symbol properties. // Merge symbol properties.
// //
// When we have many symbols of the same name, we choose one of them, // When we have many symbols of the same name, we choose one of them,
@ -385,8 +377,10 @@ void Symbol::mergeProperties(const Symbol &other) {
exportDynamic = true; exportDynamic = true;
// DSO symbols do not affect visibility in the output. // DSO symbols do not affect visibility in the output.
if (!other.isShared()) if (!other.isShared() && other.visibility != STV_DEFAULT)
visibility = getMinVisibility(visibility, other.visibility); visibility = visibility == STV_DEFAULT
? other.visibility
: std::min(visibility, other.visibility);
} }
void Symbol::resolve(const Symbol &other) { void Symbol::resolve(const Symbol &other) {