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

Merge two overloaded functions into one function. NFC. 

llvm-svn: 344089
This commit is contained in:
Rui Ueyama 2018-10-09 22:44:53 +00:00
parent e65cb4889e
commit 71cdbb7fe6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/SymbolTable.cpp
View File

@ -442,12 +442,6 @@ Symbol *SymbolTable::addCommon(StringRef N, uint64_t Size, uint32_t Alignment,
return S; return S;
} }
static void reportDuplicate(Symbol *Sym, InputFile *NewFile) {
if (!Config->AllowMultipleDefinition)
error("duplicate symbol: " + toString(*Sym) + "\n>>> defined in " +
toString(Sym->File) + "\n>>> defined in " + toString(NewFile));
}
static void reportDuplicate(Symbol *Sym, InputFile *NewFile, static void reportDuplicate(Symbol *Sym, InputFile *NewFile,
InputSectionBase *ErrSec, uint64_t ErrOffset) { InputSectionBase *ErrSec, uint64_t ErrOffset) {
if (Config->AllowMultipleDefinition) if (Config->AllowMultipleDefinition)
@ -455,7 +449,8 @@ static void reportDuplicate(Symbol *Sym, InputFile *NewFile,
Defined *D = cast<Defined>(Sym); Defined *D = cast<Defined>(Sym);
if (!D->Section || !ErrSec) { if (!D->Section || !ErrSec) {
reportDuplicate(Sym, NewFile); error("duplicate symbol: " + toString(*Sym) + "\n>>> defined in " +
toString(Sym->File) + "\n>>> defined in " + toString(NewFile));
return; return;
} }
@ -544,7 +539,7 @@ Symbol *SymbolTable::addBitcode(StringRef Name, uint8_t Binding,
if (Cmp > 0) if (Cmp > 0)
replaceSymbol<Defined>(S, &F, Name, Binding, StOther, Type, 0, 0, nullptr); replaceSymbol<Defined>(S, &F, Name, Binding, StOther, Type, 0, 0, nullptr);
else if (Cmp == 0) else if (Cmp == 0)
reportDuplicate(S, &F); reportDuplicate(S, &F, nullptr, 0);
return S; return S;
} }