[llvm-commits] [llvm] r116579 - in /llvm/trunk: lib/MC/ELFObjectWriter.cpp test/MC/ELF/alias.s

[Rafael Espindola]

Author: rafael
Date: Fri Oct 15 10:39:06 2010
New Revision: 116579

URL: http://llvm.org/viewvc/llvm-project?rev=116579&view=rev
Log:
Refactor code a bit and avoid creating unnecessary entries in the string
map.

Modified:
    llvm/trunk/lib/MC/ELFObjectWriter.cpp
    llvm/trunk/test/MC/ELF/alias.s

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=116579&r1=116578&r2=116579&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Fri Oct 15 10:39:06 2010
@@ -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);

Modified: llvm/trunk/test/MC/ELF/alias.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/alias.s?rev=116579&r1=116578&r2=116579&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/alias.s (original)
+++ llvm/trunk/test/MC/ELF/alias.s Fri Oct 15 10:39:06 2010
@@ -25,7 +25,7 @@
 // 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 @@
 // 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 @@
 // 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 @@
 // 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 @@
 // 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)