From c040b414544bf51d564a13b574ef525c1f748dc2 Mon Sep 17 00:00:00 2001 From: Max Kazantsev Date: Mon, 24 Dec 2018 10:30:04 +0000 Subject: [PATCH] Revert rL350048 and rL350050 These patches have broken almost all buildbots on test DebugInfo/X86/addr_comments.ll. Reverting to green. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350052 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/AddressPool.cpp | 23 ++++++++--------------- lib/CodeGen/AsmPrinter/AddressPool.h | 2 +- test/DebugInfo/X86/addr_comments.ll | 16 +++++++--------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/AddressPool.cpp b/lib/CodeGen/AsmPrinter/AddressPool.cpp index c57e3021710..042243b7925 100644 --- a/lib/CodeGen/AsmPrinter/AddressPool.cpp +++ b/lib/CodeGen/AsmPrinter/AddressPool.cpp @@ -24,23 +24,21 @@ unsigned AddressPool::getIndex(const MCSymbol *Sym, bool TLS) { return IterBool.first->second.Number; } -MCSymbol *AddressPool::emitHeader(AsmPrinter &Asm, MCSection *Section) { + +void AddressPool::emitHeader(AsmPrinter &Asm, MCSection *Section) { static const uint8_t AddrSize = Asm.getDataLayout().getPointerSize(); - StringRef Prefix = "debug_addr_"; - MCSymbol *BeginLabel = Asm.createTempSymbol(Prefix + "start"); - MCSymbol *EndLabel = Asm.createTempSymbol(Prefix + "end"); + uint64_t Length = sizeof(uint16_t) // version + + sizeof(uint8_t) // address_size + + sizeof(uint8_t) // segment_selector_size + + AddrSize * Pool.size(); // entries Asm.OutStreamer->AddComment("Length of contribution"); - Asm.EmitLabelDifference(EndLabel, BeginLabel, - 4); // TODO: Support DWARF64 format. - Asm.OutStreamer->EmitLabel(BeginLabel); + Asm.emitInt32(Length); // TODO: Support DWARF64 format. Asm.OutStreamer->AddComment("DWARF version number"); Asm.emitInt16(Asm.getDwarfVersion()); Asm.OutStreamer->AddComment("Address size"); 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. @@ -51,10 +49,8 @@ void AddressPool::emit(AsmPrinter &Asm, MCSection *AddrSection) { // Start the dwarf addr section. Asm.OutStreamer->SwitchSection(AddrSection); - MCSymbol *EndLabel = nullptr; - if (Asm.getDwarfVersion() >= 5) - EndLabel = emitHeader(Asm, AddrSection); + emitHeader(Asm, AddrSection); // Define the symbol that marks the start of the contribution. // It is referenced via DW_AT_addr_base. @@ -71,7 +67,4 @@ void AddressPool::emit(AsmPrinter &Asm, MCSection *AddrSection) { for (const MCExpr *Entry : Entries) Asm.OutStreamer->EmitValue(Entry, Asm.getDataLayout().getPointerSize()); - - if (EndLabel) - Asm.OutStreamer->EmitLabel(EndLabel); } diff --git a/lib/CodeGen/AsmPrinter/AddressPool.h b/lib/CodeGen/AsmPrinter/AddressPool.h index 44a53b02f48..2209c7eb50e 100644 --- a/lib/CodeGen/AsmPrinter/AddressPool.h +++ b/lib/CodeGen/AsmPrinter/AddressPool.h @@ -55,7 +55,7 @@ public: void setLabel(MCSymbol *Sym) { AddressTableBaseSym = Sym; } private: - MCSymbol *emitHeader(AsmPrinter &Asm, MCSection *Section); + void emitHeader(AsmPrinter &Asm, MCSection *Section); /// Symbol designates the start of the contribution to the address table. MCSymbol *AddressTableBaseSym = nullptr; diff --git a/test/DebugInfo/X86/addr_comments.ll b/test/DebugInfo/X86/addr_comments.ll index 487973d2267..780b37915a4 100644 --- a/test/DebugInfo/X86/addr_comments.ll +++ b/test/DebugInfo/X86/addr_comments.ll @@ -1,14 +1,12 @@ ; RUN: llc %s -mtriple=i386-unknown-linux-gnu -filetype=asm -o - | FileCheck %s -; CHECK: .section .debug_addr -; CHECK-NEXT: .long .Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution -; CHECK-NEXT: .Ldebug_addr_startt 0: -; CHECK-NEXT: .short 5 # DWARF version number -; CHECK-NEXT: .byte 4 # Address size -; CHECK-NEXT: .byte 0 # Segment selector size -; CHECK-NEXT: .Laddr_table_base0: -; CHECK-NEXT: .long .Lfunc_begin0 -; CHECK-NEXT: .Ldebug_addr_end0: +; CHECK: .section .debug_addr +; CHECK: .long 8 # Length of contribution +; CHECK: .short 5 # DWARF version number +; CHECK: .byte 4 # Address size +; CHECK: .byte 0 # Segment selector size +; CHECK: .Laddr_table_base0: +; CHECK: .long .Lfunc_begin0 ; Function Attrs: noinline nounwind optnone uwtable define dso_local void @foo() #0 !dbg !7 { -- 2.50.1