diff options
author | David Blaikie <dblaikie@gmail.com> | 2018-12-24 07:56:40 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2018-12-24 07:56:40 +0000 |
commit | 0d0aa61d23a40df93c040cf2a3c80448c52d8dff (patch) | |
tree | 774f572ef110ba8b91dcf1906b3ced06d5131582 | |
parent | af3ad8aabd2b0e6d8e4c6aa95b115587f268707f (diff) |
Fix build - follow-up to r350048 which broke headerless (v4) address pool
-rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp | 14 | ||||
-rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AddressPool.h | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp b/llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp index 97c08da3827..c57e3021710 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AddressPool.cpp @@ -24,12 +24,11 @@ unsigned AddressPool::getIndex(const MCSymbol *Sym, bool TLS) { return IterBool.first->second.Number; } - -void AddressPool::emitHeader(AsmPrinter &Asm, MCSection *Section) { +MCSymbol *AddressPool::emitHeader(AsmPrinter &Asm, MCSection *Section) { static const uint8_t AddrSize = Asm.getDataLayout().getPointerSize(); StringRef Prefix = "debug_addr_"; MCSymbol *BeginLabel = Asm.createTempSymbol(Prefix + "start"); - EndLabel = Asm.createTempSymbol(Prefix + "end"); + MCSymbol *EndLabel = Asm.createTempSymbol(Prefix + "end"); Asm.OutStreamer->AddComment("Length of contribution"); Asm.EmitLabelDifference(EndLabel, BeginLabel, 4); // TODO: Support DWARF64 format. @@ -40,6 +39,8 @@ void AddressPool::emitHeader(AsmPrinter &Asm, MCSection *Section) { Asm.emitInt8(AddrSize); Asm.OutStreamer->AddComment("Segment selector size"); Asm.emitInt8(0); // TODO: Support non-zero segment_selector_size. + + return EndLabel; } // Emit addresses into the section given. @@ -50,8 +51,10 @@ void AddressPool::emit(AsmPrinter &Asm, MCSection *AddrSection) { // Start the dwarf addr section. Asm.OutStreamer->SwitchSection(AddrSection); + MCSymbol *EndLabel = nullptr; + if (Asm.getDwarfVersion() >= 5) - emitHeader(Asm, AddrSection); + EndLabel = emitHeader(Asm, AddrSection); // Define the symbol that marks the start of the contribution. // It is referenced via DW_AT_addr_base. @@ -69,5 +72,6 @@ void AddressPool::emit(AsmPrinter &Asm, MCSection *AddrSection) { for (const MCExpr *Entry : Entries) Asm.OutStreamer->EmitValue(Entry, Asm.getDataLayout().getPointerSize()); - Asm.OutStreamer->EmitLabel(EndLabel); + if (EndLabel) + Asm.OutStreamer->EmitLabel(EndLabel); } diff --git a/llvm/lib/CodeGen/AsmPrinter/AddressPool.h b/llvm/lib/CodeGen/AsmPrinter/AddressPool.h index e1bf3e9ae58..44a53b02f48 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AddressPool.h +++ b/llvm/lib/CodeGen/AsmPrinter/AddressPool.h @@ -30,8 +30,6 @@ class AddressPool { }; DenseMap<const MCSymbol *, AddressPoolEntry> Pool; - MCSymbol *EndLabel; - /// Record whether the AddressPool has been queried for an address index since /// the last "resetUsedFlag" call. Used to implement type unit fallback - a /// type that references addresses cannot be placed in a type unit when using @@ -57,7 +55,7 @@ public: void setLabel(MCSymbol *Sym) { AddressTableBaseSym = Sym; } private: - void emitHeader(AsmPrinter &Asm, MCSection *Section); + MCSymbol *emitHeader(AsmPrinter &Asm, MCSection *Section); /// Symbol designates the start of the contribution to the address table. MCSymbol *AddressTableBaseSym = nullptr; |