diff options
| -rw-r--r-- | include/llvm/MC/MCAsmInfo.h | 3 | ||||
| -rw-r--r-- | include/llvm/MC/MCAsmInfoDarwin.h | 3 | ||||
| -rw-r--r-- | lib/MC/MCAsmInfo.cpp | 6 | ||||
| -rw-r--r-- | lib/MC/MCAsmInfoDarwin.cpp | 4 | ||||
| -rw-r--r-- | lib/MC/MCDwarf.cpp | 21 |
5 files changed, 21 insertions, 16 deletions
diff --git a/include/llvm/MC/MCAsmInfo.h b/include/llvm/MC/MCAsmInfo.h index 0ea9d01f68..566535ebac 100644 --- a/include/llvm/MC/MCAsmInfo.h +++ b/include/llvm/MC/MCAsmInfo.h @@ -328,6 +328,9 @@ namespace llvm { getExprForPersonalitySymbol(const MCSymbol *Sym, MCStreamer &Streamer) const; + virtual const MCExpr * + getExprForFDESymbol(const MCSymbol *Sym, MCStreamer &Streamer) const; + bool usesSunStyleELFSectionSwitchSyntax() const { return SunStyleELFSectionSwitchSyntax; } diff --git a/include/llvm/MC/MCAsmInfoDarwin.h b/include/llvm/MC/MCAsmInfoDarwin.h index 143f205665..634f163d84 100644 --- a/include/llvm/MC/MCAsmInfoDarwin.h +++ b/include/llvm/MC/MCAsmInfoDarwin.h @@ -26,8 +26,7 @@ namespace llvm { struct MCAsmInfoDarwin : public MCAsmInfo { explicit MCAsmInfoDarwin(); virtual const MCExpr * - getExprForPersonalitySymbol(const MCSymbol *Sym, - MCStreamer &Streamer) const; + getExprForFDESymbol(const MCSymbol *Sym, MCStreamer &Streamer) const; }; } diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp index 873802ae98..b685c1a264 100644 --- a/lib/MC/MCAsmInfo.cpp +++ b/lib/MC/MCAsmInfo.cpp @@ -112,5 +112,11 @@ unsigned MCAsmInfo::getSLEB128Size(int Value) { const MCExpr * MCAsmInfo::getExprForPersonalitySymbol(const MCSymbol *Sym, MCStreamer &Streamer) const { + return getExprForFDESymbol(Sym, Streamer); +} + +const MCExpr * +MCAsmInfo::getExprForFDESymbol(const MCSymbol *Sym, + MCStreamer &Streamer) const { return MCSymbolRefExpr::Create(Sym, Streamer.getContext()); } diff --git a/lib/MC/MCAsmInfoDarwin.cpp b/lib/MC/MCAsmInfoDarwin.cpp index 04862fae16..fea1548f46 100644 --- a/lib/MC/MCAsmInfoDarwin.cpp +++ b/lib/MC/MCAsmInfoDarwin.cpp @@ -61,8 +61,8 @@ MCAsmInfoDarwin::MCAsmInfoDarwin() { } const MCExpr * -MCAsmInfoDarwin::getExprForPersonalitySymbol(const MCSymbol *Sym, - MCStreamer &Streamer) const { +MCAsmInfoDarwin::getExprForFDESymbol(const MCSymbol *Sym, + MCStreamer &Streamer) const { MCContext &Context = Streamer.getContext(); const MCExpr *Res = MCSymbolRefExpr::Create(Sym, Context); MCSymbol *PCSym = Context.CreateTempSymbol(); diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp index d677d0c3b6..7111758a72 100644 --- a/lib/MC/MCDwarf.cpp +++ b/lib/MC/MCDwarf.cpp @@ -465,19 +465,16 @@ static unsigned getSizeForEncoding(MCStreamer &streamer, static void EmitSymbol(MCStreamer &streamer, const MCSymbol &symbol, unsigned symbolEncoding) { + MCContext &context = streamer.getContext(); + const MCAsmInfo &asmInfo = context.getAsmInfo(); + const MCExpr *v = asmInfo.getExprForFDESymbol(&symbol, + streamer); unsigned size = getSizeForEncoding(streamer, symbolEncoding); unsigned application = symbolEncoding & 0x70; - switch (application) { - default: - assert(0 && "Unknown Encoding"); - break; - case 0: - streamer.EmitSymbolValue(&symbol, size); - break; - case dwarf::DW_EH_PE_pcrel: - streamer.EmitPCRelSymbolValue(&symbol, size); - break; - } + if (isa<MCSymbolRefExpr>(v) && application == dwarf::DW_EH_PE_pcrel) + streamer.EmitPCRelValue(v, size); + else + streamer.EmitAbsValue(v, size); } static void EmitPersonality(MCStreamer &streamer, const MCSymbol &symbol, @@ -756,7 +753,7 @@ MCSymbol *FrameEmitterImpl::EmitFDE(MCStreamer &streamer, unsigned size = getSizeForEncoding(streamer, fdeEncoding); // PC Begin - streamer.EmitPCRelSymbolValue(frame.Begin, size); + EmitSymbol(streamer, *frame.Begin, fdeEncoding); // PC Range const MCExpr *Range = MakeStartMinusEndExpr(streamer, *frame.Begin, |