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 9a181621c77bde898de982b9ad26e95ed9ed40b6..c4281a4f8a22beb73a13d973885b500a0f3cd1f4 100644 (file)
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -789,28 +789,18 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
     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 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
       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 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
       // 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);

diff --git a/test/MC/ELF/alias.s b/test/MC/ELF/alias.s
index 604131c3ee5e59a99000a6c0957cd49d046746e7..4842d2746a6f5a2180a99f8951fc76a549f90f12 100644 (file)
--- a/test/MC/ELF/alias.s
+++ b/test/MC/ELF/alias.s
@@ -25,7 +25,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_size', 0)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 2
-// CHECK-NEXT: (('st_name', 34) # 'bar4'
+// CHECK-NEXT: (('st_name', 29) # 'bar4'
 // CHECK-NEXT:  ('st_bind', 0)
 // CHECK-NEXT:  ('st_type', 2)
 // CHECK-NEXT:  ('st_other', 0)
@@ -43,7 +43,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_size', 0)
 // CHECK-NEXT: ),
 // CHECK-NEXT:  # Symbol 4
-// CHECK-NEXT:  (('st_name', 19) # 'foo3'
+// CHECK-NEXT:  (('st_name', 14) # 'foo3'
 // CHECK-NEXT:   ('st_bind', 0)
 // CHECK-NEXT:   ('st_type', 0)
 // CHECK-NEXT:   ('st_other', 0)
@@ -52,7 +52,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_size', 0)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 5
-// CHECK-NEXT: (('st_name', 29) # 'foo4'
+// CHECK-NEXT: (('st_name', 24) # 'foo4'
 // CHECK-NEXT:  ('st_bind', 0)
 // CHECK-NEXT:  ('st_type', 2)
 // CHECK-NEXT:  ('st_other', 0)
@@ -67,7 +67,7 @@ bar4 = foo4
 // CHECK:       # Symbol 8
 // CHECK-NEXT:  (('st_name', 0) # ''
 // CHECK:       # Symbol 9
-// CHECK-NEXT:  (('st_name', 24) # 'bar3'
+// CHECK-NEXT:  (('st_name', 19) # 'bar3'
 // CHECK-NEXT:   ('st_bind', 1)
 // CHECK-NEXT:   ('st_type', 0)
 // CHECK-NEXT:   ('st_other', 0)
@@ -75,7 +75,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_value', 0)
 // CHECK-NEXT:   ('st_size', 0)
 // CHECK:       # Symbol 10
-// CHECK-NEXT:  (('st_name', 14) # 'bar2'
+// CHECK-NEXT:  (('st_name', 9) # 'bar2'
 // CHECK-NEXT:   ('st_bind', 1)
 // CHECK-NEXT:   ('st_type', 0)
 // CHECK-NEXT:   ('st_other', 0)