replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify. NFC. 

Since r321982 we don't set VersionId in scanShlibUndefined, which
makes InVersionScript redundant.

llvm-svn: 326641
This commit is contained in:
Rafael Espindola 2018-03-03 02:13:50 +00:00
parent f318ddc93e
commit e3a6062844
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/ELF/SymbolTable.cpp
View File

@ -235,7 +235,6 @@ std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name) {
Symbol *Sym; Symbol *Sym;
if (IsNew) { if (IsNew) {
Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>()); Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
Sym->InVersionScript = false;
Sym->Visibility = STV_DEFAULT; Sym->Visibility = STV_DEFAULT;
Sym->IsUsedInRegularObj = false; Sym->IsUsedInRegularObj = false;
Sym->ExportDynamic = false; Sym->ExportDynamic = false;
@ -698,10 +697,9 @@ void SymbolTable::assignExactVersion(SymbolVersion Ver, uint16_t VersionId,
if (Sym->getName().contains('@')) if (Sym->getName().contains('@'))
continue; continue;
if (Sym->InVersionScript) if (Sym->VersionId != Config->DefaultSymbolVersion)
warn("duplicate symbol '" + Ver.Name + "' in version script"); warn("duplicate symbol '" + Ver.Name + "' in version script");
Sym->VersionId = VersionId; Sym->VersionId = VersionId;
Sym->InVersionScript = true;
} }
} }

4
lld/ELF/Symbols.h
View File

@ -80,9 +80,6 @@ public:
// True if this symbol is specified by --trace-symbol option. // True if this symbol is specified by --trace-symbol option.
unsigned Traced : 1; unsigned Traced : 1;
// This symbol version was found in a version script.
unsigned InVersionScript : 1;
// The file from which this symbol was created. // The file from which this symbol was created.
InputFile *File; InputFile *File;
@ -368,7 +365,6 @@ void replaceSymbol(Symbol *S, ArgT &&... Arg) {
S->ExportDynamic = Sym.ExportDynamic; S->ExportDynamic = Sym.ExportDynamic;
S->CanInline = Sym.CanInline; S->CanInline = Sym.CanInline;
S->Traced = Sym.Traced; S->Traced = Sym.Traced;
S->InVersionScript = Sym.InVersionScript;
// Print out a log message if --trace-symbol was specified. // Print out a log message if --trace-symbol was specified.
// This is for debugging. // This is for debugging.