diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-03-27 00:28:24 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-03-27 00:28:24 +0000 |
| commit | e459f72ee0e24a26c9625bc7485f050ef5753ddc (patch) | |
| tree | ce3a69c858c72af95c2edf74f1ced5ab37be79f2 /lib/MC/ELFObjectWriter.cpp | |
| parent | e6cee9f723192de1c49947132bbecc9e2b9d3898 (diff) | |
| download | llvm-e459f72ee0e24a26c9625bc7485f050ef5753ddc.tar.gz llvm-e459f72ee0e24a26c9625bc7485f050ef5753ddc.tar.bz2 llvm-e459f72ee0e24a26c9625bc7485f050ef5753ddc.tar.xz | |
Correctly propagates st_size.
This also finally removes a bogus call to AliasedSymbol.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204883 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/ELFObjectWriter.cpp')
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 7c2135b248..277716c89b 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -609,9 +609,6 @@ static const MCSymbol *getBaseSymbol(const MCAsmLayout &Layout, 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 @@ void ELFObjectWriter::WriteSymbol(SymbolTableWriter &Writer, ELFSymbolData &MSD, // 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 @@ void ELFObjectWriter::WriteSymbol(SymbolTableWriter &Writer, ELFSymbolData &MSD, 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)) |