summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC/ELFObjectWriter.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2015-06-19 23:43:47 +0000
committerNico Weber <nicolasweber@gmx.de>2015-06-19 23:43:47 +0000
commit67e715ff7d8626d97be58e8f8a1729d171afca0c (patch)
tree2546c97c4853fa0127601714ffba0abd0c2bc580 /llvm/lib/MC/ELFObjectWriter.cpp
parentcfe0393b8269b85e199025b2350277563f43cd29 (diff)
downloadbcm5719-llvm-67e715ff7d8626d97be58e8f8a1729d171afca0c.tar.gz
bcm5719-llvm-67e715ff7d8626d97be58e8f8a1729d171afca0c.zip
Revert 240130, it caused crashes (repro in PR23900).
llvm-svn: 240193
Diffstat (limited to 'llvm/lib/MC/ELFObjectWriter.cpp')
-rw-r--r--llvm/lib/MC/ELFObjectWriter.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 2fe8db92195..234c350d9dc 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -786,15 +786,10 @@ void ELFObjectWriter::computeSymbolTable(
Renames.count(&Symbol)))
continue;
- if (Symbol.isTemporary() && Symbol.isUndefined())
- Ctx.reportFatalError(SMLoc(), "Undefined temporary");
-
ELFSymbolData MSD;
MSD.Symbol = cast<MCSymbolELF>(&Symbol);
bool Local = Symbol.getBinding() == ELF::STB_LOCAL;
- assert(Local || !Symbol.isTemporary());
-
if (Symbol.isAbsolute()) {
MSD.SectionIndex = ELF::SHN_ABS;
} else if (Symbol.isCommon()) {
@@ -893,11 +888,9 @@ void ELFObjectWriter::computeSymbolTable(
unsigned Index = FileNames.size() + 1;
for (ELFSymbolData &MSD : LocalSymbolData) {
- unsigned StringIndex;
- if (MSD.Symbol->getType() == ELF::STT_SECTION || MSD.Name.empty())
- StringIndex = 0;
- else
- StringIndex = StrTabBuilder.getOffset(MSD.Name);
+ unsigned StringIndex = MSD.Symbol->getType() == ELF::STT_SECTION
+ ? 0
+ : StrTabBuilder.getOffset(MSD.Name);
MSD.Symbol->setIndex(Index++);
writeSymbol(Writer, StringIndex, MSD, Layout);
}
OpenPOWER on IntegriCloud