From 835439a397407e421263bd476e5b18bf787ffb6a Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 22 Dec 2010 22:04:28 +0000 Subject: Assert that the AddrDelta expression is really constant and wrap it in a set if we have a lame assembler. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122446 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCObjectStreamer.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/MC/MCObjectStreamer.cpp') diff --git a/lib/MC/MCObjectStreamer.cpp b/lib/MC/MCObjectStreamer.cpp index cbc66f1cf9..af102ecf78 100644 --- a/lib/MC/MCObjectStreamer.cpp +++ b/lib/MC/MCObjectStreamer.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCObjectStreamer.h" #include "llvm/Support/ErrorHandling.h" @@ -90,7 +91,7 @@ void MCObjectStreamer::EmitValueImpl(const MCExpr *Value, unsigned Size, return; } DF->addFixup(MCFixup::Create(DF->getContents().size(), - AddValueSymbols(Value), + Value, MCFixup::getKindForSize(Size, isPCRel))); DF->getContents().resize(DF->getContents().size() + Size, 0); } @@ -210,6 +211,11 @@ void MCObjectStreamer::EmitDwarfAdvanceLineAddr(int64_t LineDelta, MCDwarfLineAddr::Emit(this, LineDelta, Res); return; } + if (!getContext().getAsmInfo().hasAggressiveSymbolFolding()) { + MCSymbol *ABS = getContext().CreateTempSymbol(); + EmitAssignment(ABS, AddrDelta); + AddrDelta = MCSymbolRefExpr::Create(ABS, getContext()); + } new MCDwarfLineAddrFragment(LineDelta, *AddrDelta, getCurrentSectionData()); } -- cgit v1.2.3