Refactor code a bit and avoid creating unnecessary entries in the string
map.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116579 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 9a18162..c4281a4 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -789,28 +789,18 @@
if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol)))
continue;
- uint64_t &Entry = StringIndexMap[Symbol.getName()];
- if (!Entry) {
- Entry = StringTable.size();
- StringTable += Symbol.getName();
- StringTable += '\x00';
- }
-
ELFSymbolData MSD;
MSD.SymbolData = it;
- MSD.StringIndex = Entry;
bool Local = isLocal(*it);
+ bool Add = false;
if (it->isCommon()) {
assert(!Local);
MSD.SectionIndex = ELF::SHN_COMMON;
- ExternalSymbolData.push_back(MSD);
+ Add = true;
} else if (Symbol.isAbsolute()) {
MSD.SectionIndex = ELF::SHN_ABS;
- if (Local)
- LocalSymbolData.push_back(MSD);
- else
- ExternalSymbolData.push_back(MSD);
+ Add = true;
} else if (Symbol.isVariable()) {
const MCExpr *Value = Symbol.getVariableValue();
assert (Value->getKind() == MCExpr::SymbolRef && "Unimplemented");
@@ -819,10 +809,7 @@
if (RefSymbol.isDefined()) {
MSD.SectionIndex = SectionIndexMap.lookup(&RefSymbol.getSection());
assert(MSD.SectionIndex && "Invalid section index!");
- if (Local)
- LocalSymbolData.push_back(MSD);
- else
- ExternalSymbolData.push_back(MSD);
+ Add = true;
}
} else if (Symbol.isUndefined()) {
assert(!Local);
@@ -831,11 +818,24 @@
// are able to set it.
if (GetBinding(*it) == ELF::STB_LOCAL)
SetBinding(*it, ELF::STB_GLOBAL);
- UndefinedSymbolData.push_back(MSD);
+ Add = true;
} else {
MSD.SectionIndex = SectionIndexMap.lookup(&Symbol.getSection());
assert(MSD.SectionIndex && "Invalid section index!");
- if (Local)
+ Add = true;
+ }
+
+ if (Add) {
+ uint64_t &Entry = StringIndexMap[Symbol.getName()];
+ if (!Entry) {
+ Entry = StringTable.size();
+ StringTable += Symbol.getName();
+ StringTable += '\x00';
+ }
+ MSD.StringIndex = Entry;
+ if (MSD.SectionIndex == ELF::SHN_UNDEF)
+ UndefinedSymbolData.push_back(MSD);
+ else if (Local)
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);