commit a041ef1bd8905f0d58e301c6830b183002ff1847
author Rafael Espindola <rafael.espindola@gmail.com> Thu Mar 27 00:28:24 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Mar 27 00:28:24 2014 +0000
tree ded1b281e300a226655f1d349904910ff07bef57
parent 6373e70f81c167c7f9dd8ecc4ef5c6e7b47685bb

Correctly propagates st_size.

This also finally removes a bogus call to AliasedSymbol.

llvm-svn: 204883

llvm/lib/MC/ELFObjectWriter.cpp

diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 7c2135b2..277716c 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -609,9 +609,6 @@
 void ELFObjectWriter::WriteSymbol(SymbolTableWriter &Writer, ELFSymbolData &MSD,
                                   const MCAsmLayout &Layout) {
   MCSymbolData &OrigData = *MSD.SymbolData;
-  MCSymbolData &Data =
-    Layout.getAssembler().getSymbolData(OrigData.getSymbol().AliasedSymbol());
-
   const MCSymbol *Base = getBaseSymbol(Layout, OrigData.getSymbol());
 
   // This has to be in sync with when computeSymbolTable uses SHN_ABS or
@@ -621,9 +618,10 @@
   // Binding and Type share the same byte as upper and lower nibbles
   uint8_t Binding = MCELF::GetBinding(OrigData);
   uint8_t Type = MCELF::GetType(OrigData);
+  MCSymbolData *BaseSD = nullptr;
   if (Base) {
-    MCSymbolData BaseSD = Layout.getAssembler().getSymbolData(*Base);
-    Type = mergeTypeForSet(Type, MCELF::GetType(BaseSD));
+    BaseSD = &Layout.getAssembler().getSymbolData(*Base);
+    Type = mergeTypeForSet(Type, MCELF::GetType(*BaseSD));
   }
   if (OrigData.getFlags() & ELF_Other_ThumbFunc)
     Type = ELF::STT_FUNC;
@@ -640,9 +638,10 @@
     Value |= 1;
   uint64_t Size = 0;
 
-  assert(!(Data.isCommon() && !Data.isExternal()));
+  const MCExpr *ESize = OrigData.getSize();
+  if (!ESize && Base)
+    ESize = BaseSD->getSize();
 
-  const MCExpr *ESize = Data.getSize();
   if (ESize) {
     int64_t Res;
     if (!ESize->EvaluateAsAbsolute(Res, Layout))