[llvm] [BOLT][DWARF] Cleanup buffer initialization for DWO range writer (PR #97843)
Sayhaan Siddiqui via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 9 17:40:43 PDT 2024
https://github.com/sayhaan updated https://github.com/llvm/llvm-project/pull/97843
>From 57dc6c887de58b7457a82af8b574699f505760c3 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Fri, 28 Jun 2024 14:39:21 -0700
Subject: [PATCH 1/4] Cleanup buffer initialization for DWO range writer
instances
Summary:
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
Differential Revision: https://phabricator.intern.facebook.com/D59175271
---
bolt/include/bolt/Core/DebugData.h | 3 +
bolt/lib/Rewrite/DWARFRewriter.cpp | 1 +
bolt/test/X86/debug-fission-single-convert.s | 2 +-
bolt/test/X86/dwarf4-df-dualcu.test | 38 ++++++---
...4-df-input-lowpc-ranges-cus-no-blocks.test | 80 +++++++++++++++++++
.../X86/dwarf4-df-input-lowpc-ranges-cus.test | 52 ++++++------
.../X86/dwarf4-df-input-lowpc-ranges.test | 15 ++--
7 files changed, 144 insertions(+), 47 deletions(-)
create mode 100644 bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
diff --git a/bolt/include/bolt/Core/DebugData.h b/bolt/include/bolt/Core/DebugData.h
index cdcc8cd61f4fa..3c2ad4a2497d5 100644
--- a/bolt/include/bolt/Core/DebugData.h
+++ b/bolt/include/bolt/Core/DebugData.h
@@ -205,6 +205,9 @@ class DebugRangesSectionWriter {
return std::move(RangesBuffer);
}
+ /// Clears the ranges buffer.
+ void clearBuffer() { RangesBuffer->clear(); }
+
RangesWriterKind getKind() const { return Kind; }
static bool classof(const DebugRangesSectionWriter *Writer) {
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 3751d6bee772e..c6b397cc57322 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -652,6 +652,7 @@ void DWARFRewriter::updateDebugInfo() {
auto LegacyRangesSectionWriterByCU =
std::make_unique<DebugRangesSectionWriter>();
LegacyRangesSectionWriterByCU->initSection(CU);
+ LegacyRangesSectionWriterByCU->clearBuffer();
LegacyRangesWritersByCU[*DWOId] =
std::move(LegacyRangesSectionWriterByCU);
}
diff --git a/bolt/test/X86/debug-fission-single-convert.s b/bolt/test/X86/debug-fission-single-convert.s
index 4cd881740b2f8..bb0b790157123 100644
--- a/bolt/test/X86/debug-fission-single-convert.s
+++ b/bolt/test/X86/debug-fission-single-convert.s
@@ -27,9 +27,9 @@
# CHECK-NOT: warning: DWARF unit from offset {{.*}} incl. to offset {{.*}} excl. tries to read DIEs at offset {{.*}}
+# CHECK-DWO-DWO: 00000000
# CHECK-DWO-DWO: 00000010
# CHECK-DWO-DWO: 00000010
-# CHECK-DWO-DWO: 00000050
# CHECK-DWO-DWO: DW_TAG_subprogram
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
# CHECK-DWO-DWO: DW_TAG_subprogram
diff --git a/bolt/test/X86/dwarf4-df-dualcu.test b/bolt/test/X86/dwarf4-df-dualcu.test
index fb328eb1872e0..07d6e2e8a2280 100644
--- a/bolt/test/X86/dwarf4-df-dualcu.test
+++ b/bolt/test/X86/dwarf4-df-dualcu.test
@@ -40,16 +40,25 @@
; BOLT-NEXT: 00000010 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
; BOLT-NEXT: 00000010 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
; BOLT-NEXT: 00000010 <End of list>
-; BOLT-NEXT: 00000040 <End of list>
-; BOLT-NEXT: 00000050 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
+<<<<<<< HEAD
+; BOLT-NEXT: 00000030 [[#%.16x,ADDR1:]] [[#%.16x,ADDR1B:]]
+; BOLT-NEXT: 00000030 <End of list>
+; BOLT-NEXT: 00000050 [[#%.16x,ADDR2:]] [[#%.16x,ADDR2B:]]
+; BOLT-NEXT: 00000050 [[#%.16x,ADDR3:]] [[#%.16x,ADDR3B:]]
; BOLT-NEXT: 00000050 <End of list>
-; BOLT-NEXT: 00000070 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
-; BOLT-NEXT: 00000070 <End of list>
-; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
-; BOLT-NEXT: 00000090 <End of list>
-; BOLT-NEXT: 000000b0 <End of list>
-; BOLT-NEXT: 000000c0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
-; BOLT-NEXT: 000000c0 <End of list>
+; BOLT-NEXT: 00000080 [[#%.16x,ADDR4:]] [[#%.16x,ADDR4B:]]
+; BOLT-NEXT: 00000080 <End of list>
+; BOLT-NEXT: 000000a0 [[#%.16x,ADDR5:]] [[#%.16x,ADDR5B:]]
+=======
+; BOLT-NEXT: 00000040 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
+; BOLT-NEXT: 00000040 <End of list>
+; BOLT-NEXT: 00000060 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
+; BOLT-NEXT: 00000060 <End of list>
+; BOLT-NEXT: 00000080 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
+; BOLT-NEXT: 00000080 <End of list>
+; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
+>>>>>>> c44da7cbd078 (Cleanup buffer initialization for DWO range writer instances)
+; BOLT-NEXT: 000000a0 <End of list>
; BOLT: DW_TAG_compile_unit
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000016] = "main.dwo.dwo")
@@ -65,10 +74,17 @@
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000023] = "helper.dwo.dwo")
; BOLT-NEXT: DW_AT_GNU_dwo_id
; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
-; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000090
+<<<<<<< HEAD
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x000000a0
+; BOLT-NEXT: [0x[[#ADDR5]], 0x[[#ADDR5B]])
+; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000010)
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000080)
+=======
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000080
; BOLT-NEXT: [0x[[#ADDR3]], 0x[[#ADDRB3]])
; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000010)
-; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000000b0)
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000000a0)
+>>>>>>> c44da7cbd078 (Cleanup buffer initialization for DWO range writer instances)
; PRE-BOLT-DWO-MAIN: version = 0x0004
; PRE-BOLT-DWO-MAIN: DW_TAG_compile_unit
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
new file mode 100644
index 0000000000000..750576037fe49
--- /dev/null
+++ b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
@@ -0,0 +1,80 @@
+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-input-lowpc-ranges-main.s \
+; RUN: -split-dwarf-file=main.dwo -o main.o
+; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s \
+; RUN: -split-dwarf-file=mainOther.dwo -o other.o
+; RUN: %clang %cflags -gdwarf-4 -gsplit-dwarf=split main.o other.o -o main.exe
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-ranges main.exe.bolt &> %t/foo.txt
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt
+; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s
+; RUN: not llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo mainOther.dwo.dwo &> %t/mainddwodwo.txt
+; RUN: cat %t/mainddwodwo.txt | FileCheck -check-prefix=BOLT-DWO-MAIN %s
+
+;; Tests that BOLT correctly handles mixed input with DW_AT_high_pc/DW_at_low_pc and DW_AT_low_pc/DW_AT_ranges.
+
+; BOLT: .debug_ranges
+; BOLT-NEXT: 00000000 <End of list>
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR4:]] [[#%.16x,ADDRB4:]]
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
+; BOLT-NEXT: 00000010 <End of list>
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
+; BOLT-NEXT: 00000090 <End of list>
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
+; BOLT-NEXT: 000000d0 <End of list>
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
+; BOLT-NEXT: 00000110 <End of list>
+
+; BOLT: DW_TAG_compile_unit
+; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "main.dwo.dwo")
+; BOLT-NEXT: DW_AT_GNU_dwo_id
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000090)
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+; BOLT-NEXT: [0x[[#ADDR1]], 0x[[#ADDRB1]])
+; BOLT-NEXT: [0x[[#ADDR2]], 0x[[#ADDRB2]])
+; BOLT-NEXT: [0x[[#ADDR3]], 0x[[#ADDRB3]])
+; BOLT-NEXT: [0x[[#ADDR4]], 0x[[#ADDRB4]])
+; BOLT-NEXT: [0x[[#ADDR5]], 0x[[#ADDRB5]])
+; BOLT-NEXT: [0x[[#ADDR6]], 0x[[#ADDRB6]])
+; BOLT-NEXT: [0x[[#ADDR7]], 0x[[#ADDRB7]])
+; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000000)
+; BOLT-NEXT: Compile Unit
+
+; BOLT: DW_TAG_compile_unit
+; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "mainOther.dwo.dwo")
+; BOLT-NEXT: DW_AT_GNU_dwo_id
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000110
+; BOLT-NEXT: [0x[[#ADDR8]], 0x[[#ADDRB8]])
+; BOLT-NEXT: [0x[[#ADDR9]], 0x[[#ADDRB9]])
+; BOLT-NEXT: [0x[[#ADDR10]], 0x[[#ADDRB10]])
+; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000018)
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000150)
+; BOLT: {{^$}}
+
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
+
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
+; BOLT-DWO-MAIN: DW_TAG_subprogram
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test
index cf9357d5f3c59..ecf08969c17d3 100644
--- a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test
+++ b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test
@@ -25,32 +25,30 @@
; BOLT-NEXT: 00000010 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
; BOLT-NEXT: 00000010 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
; BOLT-NEXT: 00000010 <End of list>
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
; BOLT-NEXT: 00000090 <End of list>
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
-; BOLT-NEXT: 000000a0 <End of list>
-; BOLT-NEXT: 000000e0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
-; BOLT-NEXT: 000000e0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
-; BOLT-NEXT: 000000e0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
-; BOLT-NEXT: 000000e0 <End of list>
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR11:]] [[#%.16x,ADDRB11:]]
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
-; BOLT-NEXT: 00000120 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
-; BOLT-NEXT: 00000120 <End of list>
-; BOLT-NEXT: 000001a0 <End of list>
-; BOLT-NEXT: 000001b0 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
-; BOLT-NEXT: 000001b0 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
-; BOLT-NEXT: 000001b0 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
-; BOLT-NEXT: 000001b0 <End of list>
-; BOLT-NEXT: 000001f0 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
-; BOLT-NEXT: 000001f0 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
-; BOLT-NEXT: 000001f0 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
-; BOLT-NEXT: 000001f0 <End of list>
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
+; BOLT-NEXT: 000000d0 <End of list>
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR11:]] [[#%.16x,ADDRB11:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
+; BOLT-NEXT: 00000110 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
+; BOLT-NEXT: 00000110 <End of list>
+; BOLT-NEXT: 00000190 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
+; BOLT-NEXT: 00000190 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
+; BOLT-NEXT: 00000190 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
+; BOLT-NEXT: 00000190 <End of list>
+; BOLT-NEXT: 000001d0 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
+; BOLT-NEXT: 000001d0 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
+; BOLT-NEXT: 000001d0 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
+; BOLT-NEXT: 000001d0 <End of list>
; BOLT: DW_TAG_compile_unit
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "main.dwo.dwo")
@@ -71,9 +69,9 @@
; BOLT: DW_TAG_compile_unit
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "mainOther.dwo.dwo")
; BOLT-NEXT: DW_AT_GNU_dwo_id
-; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000001a0)
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000190)
; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
-; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000120
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000110
; BOLT-NEXT: [0x[[#ADDR8]], 0x[[#ADDRB8]])
; BOLT-NEXT: [0x[[#ADDR9]], 0x[[#ADDRB9]])
; BOLT-NEXT: [0x[[#ADDR10]], 0x[[#ADDRB10]])
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test
index ab4353a282475..5552ef102f115 100644
--- a/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test
+++ b/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test
@@ -23,15 +23,14 @@
; BOLT-NEXT: 00000010 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
; BOLT-NEXT: 00000010 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
; BOLT-NEXT: 00000010 <End of list>
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
+; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
; BOLT-NEXT: 00000090 <End of list>
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
-; BOLT-NEXT: 000000a0 <End of list>
-; BOLT-NEXT: 000000e0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
-; BOLT-NEXT: 000000e0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
-; BOLT-NEXT: 000000e0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
-; BOLT-NEXT: 000000e0 <End of list>
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
+; BOLT-NEXT: 000000d0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
+; BOLT-NEXT: 000000d0 <End of list>
; BOLT: DW_TAG_compile_unit
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "main.dwo.dwo")
>From 32be29a20b017e1f30de07cb247aa1f15efcc977 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Mon, 8 Jul 2024 13:00:47 -0700
Subject: [PATCH 2/4] Formatting changes and updates
---
.../dwarf4-df-input-lowpc-ranges-cus-other.s | 604 ++++++++++++++++++
bolt/test/X86/dwarf4-df-dualcu.test | 18 -
2 files changed, 604 insertions(+), 18 deletions(-)
create mode 100644 bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s
diff --git a/bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s b/bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s
new file mode 100644
index 0000000000000..da276b7340bfa
--- /dev/null
+++ b/bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s
@@ -0,0 +1,604 @@
+## clang++ -g2 -gdwarf-4 -gsplit-dwarf -fdebug-compilation-dir='.'
+## __attribute__((always_inline))
+## int doStuffOther(int val) {
+## if (val)
+## ++val;
+## return val;
+## }
+## __attribute__((always_inline))
+## int doStuffOther2(int val) {
+## int foo = 3;
+## return val + foo;
+## }
+##
+##
+## int mainOther(int argc, const char** argv) {
+## return doStuffOther(argc) + doStuffOther2(argc);;
+## }
+ .text
+ .file "mainOther.cpp"
+ .globl _Z12doStuffOtheri # -- Begin function _Z12doStuffOtheri
+ .p2align 4, 0x90
+ .type _Z12doStuffOtheri, at function
+_Z12doStuffOtheri: # @_Z12doStuffOtheri
+.Lfunc_begin0:
+ .file 1 "." "mainOther.cpp"
+ .loc 1 2 0 # mainOther.cpp:2:0
+ .cfi_startproc
+# %bb.0: # %entry
+ pushq %rbp
+ .cfi_def_cfa_offset 16
+ .cfi_offset %rbp, -16
+ movq %rsp, %rbp
+ .cfi_def_cfa_register %rbp
+ movl %edi, -4(%rbp)
+.Ltmp0:
+ .loc 1 3 7 prologue_end # mainOther.cpp:3:7
+ cmpl $0, -4(%rbp)
+.Ltmp1:
+ .loc 1 3 7 is_stmt 0 # mainOther.cpp:3:7
+ je .LBB0_2
+# %bb.1: # %if.then
+.Ltmp2:
+ .loc 1 4 5 is_stmt 1 # mainOther.cpp:4:5
+ movl -4(%rbp), %eax
+ addl $1, %eax
+ movl %eax, -4(%rbp)
+.Ltmp3:
+.LBB0_2: # %if.end
+ .loc 1 5 10 # mainOther.cpp:5:10
+ movl -4(%rbp), %eax
+ .loc 1 5 3 epilogue_begin is_stmt 0 # mainOther.cpp:5:3
+ popq %rbp
+ .cfi_def_cfa %rsp, 8
+ retq
+.Ltmp4:
+.Lfunc_end0:
+ .size _Z12doStuffOtheri, .Lfunc_end0-_Z12doStuffOtheri
+ .cfi_endproc
+ # -- End function
+ .globl _Z13doStuffOther2i # -- Begin function _Z13doStuffOther2i
+ .p2align 4, 0x90
+ .type _Z13doStuffOther2i, at function
+_Z13doStuffOther2i: # @_Z13doStuffOther2i
+.Lfunc_begin1:
+ .loc 1 8 0 is_stmt 1 # mainOther.cpp:8:0
+ .cfi_startproc
+# %bb.0: # %entry
+ pushq %rbp
+ .cfi_def_cfa_offset 16
+ .cfi_offset %rbp, -16
+ movq %rsp, %rbp
+ .cfi_def_cfa_register %rbp
+ movl %edi, -4(%rbp)
+.Ltmp5:
+ .loc 1 9 7 prologue_end # mainOther.cpp:9:7
+ movl $3, -8(%rbp)
+ .loc 1 10 10 # mainOther.cpp:10:10
+ movl -4(%rbp), %eax
+ .loc 1 10 14 is_stmt 0 # mainOther.cpp:10:14
+ addl -8(%rbp), %eax
+ .loc 1 10 3 epilogue_begin # mainOther.cpp:10:3
+ popq %rbp
+ .cfi_def_cfa %rsp, 8
+ retq
+.Ltmp6:
+.Lfunc_end1:
+ .size _Z13doStuffOther2i, .Lfunc_end1-_Z13doStuffOther2i
+ .cfi_endproc
+ # -- End function
+ .globl _Z9mainOtheriPPKc # -- Begin function _Z9mainOtheriPPKc
+ .p2align 4, 0x90
+ .type _Z9mainOtheriPPKc, at function
+_Z9mainOtheriPPKc: # @_Z9mainOtheriPPKc
+.Lfunc_begin2:
+ .loc 1 13 0 is_stmt 1 # mainOther.cpp:13:0
+ .cfi_startproc
+# %bb.0: # %entry
+ pushq %rbp
+ .cfi_def_cfa_offset 16
+ .cfi_offset %rbp, -16
+ movq %rsp, %rbp
+ .cfi_def_cfa_register %rbp
+ movl %edi, -16(%rbp)
+ movq %rsi, -24(%rbp)
+.Ltmp7:
+ .loc 1 14 25 prologue_end # mainOther.cpp:14:25
+ movl -16(%rbp), %eax
+ movl %eax, -12(%rbp)
+.Ltmp8:
+ .loc 1 3 7 # mainOther.cpp:3:7
+ cmpl $0, -12(%rbp)
+.Ltmp9:
+ .loc 1 3 7 is_stmt 0 # mainOther.cpp:3:7
+ je .LBB2_2
+# %bb.1: # %if.then.i
+.Ltmp10:
+ .loc 1 4 5 is_stmt 1 # mainOther.cpp:4:5
+ movl -12(%rbp), %eax
+ addl $1, %eax
+ movl %eax, -12(%rbp)
+.Ltmp11:
+.LBB2_2: # %_Z12doStuffOtheri.exit
+ .loc 1 5 10 # mainOther.cpp:5:10
+ movl -12(%rbp), %eax
+.Ltmp12:
+ .loc 1 14 47 # mainOther.cpp:14:47
+ movl -16(%rbp), %ecx
+ movl %ecx, -4(%rbp)
+.Ltmp13:
+ .loc 1 9 7 # mainOther.cpp:9:7
+ movl $3, -8(%rbp)
+ .loc 1 10 10 # mainOther.cpp:10:10
+ movl -4(%rbp), %ecx
+ .loc 1 10 14 is_stmt 0 # mainOther.cpp:10:14
+ addl -8(%rbp), %ecx
+.Ltmp14:
+ .loc 1 14 31 is_stmt 1 # mainOther.cpp:14:31
+ addl %ecx, %eax
+ .loc 1 14 5 epilogue_begin is_stmt 0 # mainOther.cpp:14:5
+ popq %rbp
+ .cfi_def_cfa %rsp, 8
+ retq
+.Ltmp15:
+.Lfunc_end2:
+ .size _Z9mainOtheriPPKc, .Lfunc_end2-_Z9mainOtheriPPKc
+ .cfi_endproc
+ # -- End function
+ .section .debug_abbrev,"", at progbits
+ .byte 1 # Abbreviation Code
+ .byte 17 # DW_TAG_compile_unit
+ .byte 0 # DW_CHILDREN_no
+ .byte 16 # DW_AT_stmt_list
+ .byte 23 # DW_FORM_sec_offset
+ .byte 27 # DW_AT_comp_dir
+ .byte 14 # DW_FORM_strp
+ .ascii "\264B" # DW_AT_GNU_pubnames
+ .byte 25 # DW_FORM_flag_present
+ .ascii "\260B" # DW_AT_GNU_dwo_name
+ .byte 14 # DW_FORM_strp
+ .ascii "\261B" # DW_AT_GNU_dwo_id
+ .byte 7 # DW_FORM_data8
+ .byte 17 # DW_AT_low_pc
+ .byte 1 # DW_FORM_addr
+ .byte 18 # DW_AT_high_pc
+ .byte 6 # DW_FORM_data4
+ .ascii "\263B" # DW_AT_GNU_addr_base
+ .byte 23 # DW_FORM_sec_offset
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 0 # EOM(3)
+ .section .debug_info,"", at progbits
+.Lcu_begin0:
+ .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
+.Ldebug_info_start0:
+ .short 4 # DWARF version number
+ .long .debug_abbrev # Offset Into Abbrev. Section
+ .byte 8 # Address Size (in bytes)
+ .byte 1 # Abbrev [1] 0xb:0x25 DW_TAG_compile_unit
+ .long .Lline_table_start0 # DW_AT_stmt_list
+ .long .Lskel_string0 # DW_AT_comp_dir
+ # DW_AT_GNU_pubnames
+ .long .Lskel_string1 # DW_AT_GNU_dwo_name
+ .quad -1082921489565291703 # DW_AT_GNU_dwo_id
+ .quad .Lfunc_begin0 # DW_AT_low_pc
+ .long .Lfunc_end2-.Lfunc_begin0 # DW_AT_high_pc
+ .long .Laddr_table_base0 # DW_AT_GNU_addr_base
+.Ldebug_info_end0:
+ .section .debug_str,"MS", at progbits,1
+.Lskel_string0:
+ .asciz "." # string offset=0
+.Lskel_string1:
+ .asciz "mainOther.dwo" # string offset=2
+ .section .debug_str.dwo,"eMS", at progbits,1
+.Linfo_string0:
+ .asciz "_Z12doStuffOtheri" # string offset=0
+.Linfo_string1:
+ .asciz "doStuffOther" # string offset=18
+.Linfo_string2:
+ .asciz "int" # string offset=31
+.Linfo_string3:
+ .asciz "val" # string offset=35
+.Linfo_string4:
+ .asciz "_Z13doStuffOther2i" # string offset=39
+.Linfo_string5:
+ .asciz "doStuffOther2" # string offset=58
+.Linfo_string6:
+ .asciz "foo" # string offset=72
+.Linfo_string7:
+ .asciz "_Z9mainOtheriPPKc" # string offset=76
+.Linfo_string8:
+ .asciz "mainOther" # string offset=94
+.Linfo_string9:
+ .asciz "argc" # string offset=104
+.Linfo_string10:
+ .asciz "argv" # string offset=109
+.Linfo_string11:
+ .asciz "char" # string offset=114
+.Linfo_string12:
+ .asciz "clang version 19.0.0git (git at github.com:llvm/llvm-project.git df542e1ed82bd4e5a9e345d3a3ae63a76893a0cf)" # string offset=119
+.Linfo_string13:
+ .asciz "mainOther.cpp" # string offset=223
+.Linfo_string14:
+ .asciz "mainOther.dwo" # string offset=237
+ .section .debug_str_offsets.dwo,"e", at progbits
+ .long 0
+ .long 18
+ .long 31
+ .long 35
+ .long 39
+ .long 58
+ .long 72
+ .long 76
+ .long 94
+ .long 104
+ .long 109
+ .long 114
+ .long 119
+ .long 223
+ .long 237
+ .section .debug_info.dwo,"e", at progbits
+ .long .Ldebug_info_dwo_end0-.Ldebug_info_dwo_start0 # Length of Unit
+.Ldebug_info_dwo_start0:
+ .short 4 # DWARF version number
+ .long 0 # Offset Into Abbrev. Section
+ .byte 8 # Address Size (in bytes)
+ .byte 1 # Abbrev [1] 0xb:0xe1 DW_TAG_compile_unit
+ .byte 12 # DW_AT_producer
+ .short 33 # DW_AT_language
+ .byte 13 # DW_AT_name
+ .byte 14 # DW_AT_GNU_dwo_name
+ .quad -1082921489565291703 # DW_AT_GNU_dwo_id
+ .byte 2 # Abbrev [2] 0x19:0x15 DW_TAG_subprogram
+ .byte 0 # DW_AT_low_pc
+ .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
+ .byte 1 # DW_AT_frame_base
+ .byte 86
+ .long 75 # DW_AT_abstract_origin
+ .byte 3 # Abbrev [3] 0x25:0x8 DW_TAG_formal_parameter
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 124
+ .long 85 # DW_AT_abstract_origin
+ .byte 0 # End Of Children Mark
+ .byte 2 # Abbrev [2] 0x2e:0x1d DW_TAG_subprogram
+ .byte 1 # DW_AT_low_pc
+ .long .Lfunc_end1-.Lfunc_begin1 # DW_AT_high_pc
+ .byte 1 # DW_AT_frame_base
+ .byte 86
+ .long 98 # DW_AT_abstract_origin
+ .byte 3 # Abbrev [3] 0x3a:0x8 DW_TAG_formal_parameter
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 124
+ .long 108 # DW_AT_abstract_origin
+ .byte 4 # Abbrev [4] 0x42:0x8 DW_TAG_variable
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 120
+ .long 116 # DW_AT_abstract_origin
+ .byte 0 # End Of Children Mark
+ .byte 5 # Abbrev [5] 0x4b:0x13 DW_TAG_subprogram
+ .byte 0 # DW_AT_linkage_name
+ .byte 1 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 2 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ # DW_AT_external
+ .byte 1 # DW_AT_inline
+ .byte 6 # Abbrev [6] 0x55:0x8 DW_TAG_formal_parameter
+ .byte 3 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 2 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ .byte 0 # End Of Children Mark
+ .byte 7 # Abbrev [7] 0x5e:0x4 DW_TAG_base_type
+ .byte 2 # DW_AT_name
+ .byte 5 # DW_AT_encoding
+ .byte 4 # DW_AT_byte_size
+ .byte 5 # Abbrev [5] 0x62:0x1b DW_TAG_subprogram
+ .byte 4 # DW_AT_linkage_name
+ .byte 5 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 8 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ # DW_AT_external
+ .byte 1 # DW_AT_inline
+ .byte 6 # Abbrev [6] 0x6c:0x8 DW_TAG_formal_parameter
+ .byte 3 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 8 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ .byte 8 # Abbrev [8] 0x74:0x8 DW_TAG_variable
+ .byte 6 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 9 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ .byte 0 # End Of Children Mark
+ .byte 9 # Abbrev [9] 0x7d:0x5b DW_TAG_subprogram
+ .byte 2 # DW_AT_low_pc
+ .long .Lfunc_end2-.Lfunc_begin2 # DW_AT_high_pc
+ .byte 1 # DW_AT_frame_base
+ .byte 86
+ .byte 7 # DW_AT_linkage_name
+ .byte 8 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 13 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ # DW_AT_external
+ .byte 10 # Abbrev [10] 0x8d:0xb DW_TAG_formal_parameter
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 112
+ .byte 9 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 13 # DW_AT_decl_line
+ .long 94 # DW_AT_type
+ .byte 10 # Abbrev [10] 0x98:0xb DW_TAG_formal_parameter
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 104
+ .byte 10 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 13 # DW_AT_decl_line
+ .long 216 # DW_AT_type
+ .byte 11 # Abbrev [11] 0xa3:0x16 DW_TAG_inlined_subroutine
+ .long 75 # DW_AT_abstract_origin
+ .byte 3 # DW_AT_low_pc
+ .long .Ltmp12-.Ltmp8 # DW_AT_high_pc
+ .byte 1 # DW_AT_call_file
+ .byte 14 # DW_AT_call_line
+ .byte 12 # DW_AT_call_column
+ .byte 3 # Abbrev [3] 0xb0:0x8 DW_TAG_formal_parameter
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 116
+ .long 85 # DW_AT_abstract_origin
+ .byte 0 # End Of Children Mark
+ .byte 11 # Abbrev [11] 0xb9:0x1e DW_TAG_inlined_subroutine
+ .long 98 # DW_AT_abstract_origin
+ .byte 4 # DW_AT_low_pc
+ .long .Ltmp14-.Ltmp13 # DW_AT_high_pc
+ .byte 1 # DW_AT_call_file
+ .byte 14 # DW_AT_call_line
+ .byte 33 # DW_AT_call_column
+ .byte 3 # Abbrev [3] 0xc6:0x8 DW_TAG_formal_parameter
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 124
+ .long 108 # DW_AT_abstract_origin
+ .byte 4 # Abbrev [4] 0xce:0x8 DW_TAG_variable
+ .byte 2 # DW_AT_location
+ .byte 145
+ .byte 120
+ .long 116 # DW_AT_abstract_origin
+ .byte 0 # End Of Children Mark
+ .byte 0 # End Of Children Mark
+ .byte 12 # Abbrev [12] 0xd8:0x5 DW_TAG_pointer_type
+ .long 221 # DW_AT_type
+ .byte 12 # Abbrev [12] 0xdd:0x5 DW_TAG_pointer_type
+ .long 226 # DW_AT_type
+ .byte 13 # Abbrev [13] 0xe2:0x5 DW_TAG_const_type
+ .long 231 # DW_AT_type
+ .byte 7 # Abbrev [7] 0xe7:0x4 DW_TAG_base_type
+ .byte 11 # DW_AT_name
+ .byte 6 # DW_AT_encoding
+ .byte 1 # DW_AT_byte_size
+ .byte 0 # End Of Children Mark
+.Ldebug_info_dwo_end0:
+ .section .debug_abbrev.dwo,"e", at progbits
+ .byte 1 # Abbreviation Code
+ .byte 17 # DW_TAG_compile_unit
+ .byte 1 # DW_CHILDREN_yes
+ .byte 37 # DW_AT_producer
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 19 # DW_AT_language
+ .byte 5 # DW_FORM_data2
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .ascii "\260B" # DW_AT_GNU_dwo_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .ascii "\261B" # DW_AT_GNU_dwo_id
+ .byte 7 # DW_FORM_data8
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 2 # Abbreviation Code
+ .byte 46 # DW_TAG_subprogram
+ .byte 1 # DW_CHILDREN_yes
+ .byte 17 # DW_AT_low_pc
+ .ascii "\201>" # DW_FORM_GNU_addr_index
+ .byte 18 # DW_AT_high_pc
+ .byte 6 # DW_FORM_data4
+ .byte 64 # DW_AT_frame_base
+ .byte 24 # DW_FORM_exprloc
+ .byte 49 # DW_AT_abstract_origin
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 3 # Abbreviation Code
+ .byte 5 # DW_TAG_formal_parameter
+ .byte 0 # DW_CHILDREN_no
+ .byte 2 # DW_AT_location
+ .byte 24 # DW_FORM_exprloc
+ .byte 49 # DW_AT_abstract_origin
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 4 # Abbreviation Code
+ .byte 52 # DW_TAG_variable
+ .byte 0 # DW_CHILDREN_no
+ .byte 2 # DW_AT_location
+ .byte 24 # DW_FORM_exprloc
+ .byte 49 # DW_AT_abstract_origin
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 5 # Abbreviation Code
+ .byte 46 # DW_TAG_subprogram
+ .byte 1 # DW_CHILDREN_yes
+ .byte 110 # DW_AT_linkage_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 63 # DW_AT_external
+ .byte 25 # DW_FORM_flag_present
+ .byte 32 # DW_AT_inline
+ .byte 11 # DW_FORM_data1
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 6 # Abbreviation Code
+ .byte 5 # DW_TAG_formal_parameter
+ .byte 0 # DW_CHILDREN_no
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 7 # Abbreviation Code
+ .byte 36 # DW_TAG_base_type
+ .byte 0 # DW_CHILDREN_no
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 62 # DW_AT_encoding
+ .byte 11 # DW_FORM_data1
+ .byte 11 # DW_AT_byte_size
+ .byte 11 # DW_FORM_data1
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 8 # Abbreviation Code
+ .byte 52 # DW_TAG_variable
+ .byte 0 # DW_CHILDREN_no
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 9 # Abbreviation Code
+ .byte 46 # DW_TAG_subprogram
+ .byte 1 # DW_CHILDREN_yes
+ .byte 17 # DW_AT_low_pc
+ .ascii "\201>" # DW_FORM_GNU_addr_index
+ .byte 18 # DW_AT_high_pc
+ .byte 6 # DW_FORM_data4
+ .byte 64 # DW_AT_frame_base
+ .byte 24 # DW_FORM_exprloc
+ .byte 110 # DW_AT_linkage_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 63 # DW_AT_external
+ .byte 25 # DW_FORM_flag_present
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 10 # Abbreviation Code
+ .byte 5 # DW_TAG_formal_parameter
+ .byte 0 # DW_CHILDREN_no
+ .byte 2 # DW_AT_location
+ .byte 24 # DW_FORM_exprloc
+ .byte 3 # DW_AT_name
+ .ascii "\202>" # DW_FORM_GNU_str_index
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 11 # Abbreviation Code
+ .byte 29 # DW_TAG_inlined_subroutine
+ .byte 1 # DW_CHILDREN_yes
+ .byte 49 # DW_AT_abstract_origin
+ .byte 19 # DW_FORM_ref4
+ .byte 17 # DW_AT_low_pc
+ .ascii "\201>" # DW_FORM_GNU_addr_index
+ .byte 18 # DW_AT_high_pc
+ .byte 6 # DW_FORM_data4
+ .byte 88 # DW_AT_call_file
+ .byte 11 # DW_FORM_data1
+ .byte 89 # DW_AT_call_line
+ .byte 11 # DW_FORM_data1
+ .byte 87 # DW_AT_call_column
+ .byte 11 # DW_FORM_data1
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 12 # Abbreviation Code
+ .byte 15 # DW_TAG_pointer_type
+ .byte 0 # DW_CHILDREN_no
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 13 # Abbreviation Code
+ .byte 38 # DW_TAG_const_type
+ .byte 0 # DW_CHILDREN_no
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 0 # EOM(3)
+ .section .debug_addr,"", at progbits
+.Laddr_table_base0:
+ .quad .Lfunc_begin0
+ .quad .Lfunc_begin1
+ .quad .Lfunc_begin2
+ .quad .Ltmp8
+ .quad .Ltmp13
+ .section .debug_gnu_pubnames,"", at progbits
+ .long .LpubNames_end0-.LpubNames_start0 # Length of Public Names Info
+.LpubNames_start0:
+ .short 2 # DWARF Version
+ .long .Lcu_begin0 # Offset of Compilation Unit Info
+ .long 48 # Compilation Unit Length
+ .long 75 # DIE offset
+ .byte 48 # Attributes: FUNCTION, EXTERNAL
+ .asciz "doStuffOther" # External Name
+ .long 98 # DIE offset
+ .byte 48 # Attributes: FUNCTION, EXTERNAL
+ .asciz "doStuffOther2" # External Name
+ .long 125 # DIE offset
+ .byte 48 # Attributes: FUNCTION, EXTERNAL
+ .asciz "mainOther" # External Name
+ .long 0 # End Mark
+.LpubNames_end0:
+ .section .debug_gnu_pubtypes,"", at progbits
+ .long .LpubTypes_end0-.LpubTypes_start0 # Length of Public Types Info
+.LpubTypes_start0:
+ .short 2 # DWARF Version
+ .long .Lcu_begin0 # Offset of Compilation Unit Info
+ .long 48 # Compilation Unit Length
+ .long 94 # DIE offset
+ .byte 144 # Attributes: TYPE, STATIC
+ .asciz "int" # External Name
+ .long 231 # DIE offset
+ .byte 144 # Attributes: TYPE, STATIC
+ .asciz "char" # External Name
+ .long 0 # End Mark
+.LpubTypes_end0:
+ .ident "clang version 19.0.0git (git at github.com:llvm/llvm-project.git df542e1ed82bd4e5a9e345d3a3ae63a76893a0cf)"
+ .section ".note.GNU-stack","", at progbits
+ .addrsig
+ .section .debug_line,"", at progbits
+.Lline_table_start0:
diff --git a/bolt/test/X86/dwarf4-df-dualcu.test b/bolt/test/X86/dwarf4-df-dualcu.test
index 07d6e2e8a2280..5a1caa1ce065d 100644
--- a/bolt/test/X86/dwarf4-df-dualcu.test
+++ b/bolt/test/X86/dwarf4-df-dualcu.test
@@ -40,16 +40,6 @@
; BOLT-NEXT: 00000010 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
; BOLT-NEXT: 00000010 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
; BOLT-NEXT: 00000010 <End of list>
-<<<<<<< HEAD
-; BOLT-NEXT: 00000030 [[#%.16x,ADDR1:]] [[#%.16x,ADDR1B:]]
-; BOLT-NEXT: 00000030 <End of list>
-; BOLT-NEXT: 00000050 [[#%.16x,ADDR2:]] [[#%.16x,ADDR2B:]]
-; BOLT-NEXT: 00000050 [[#%.16x,ADDR3:]] [[#%.16x,ADDR3B:]]
-; BOLT-NEXT: 00000050 <End of list>
-; BOLT-NEXT: 00000080 [[#%.16x,ADDR4:]] [[#%.16x,ADDR4B:]]
-; BOLT-NEXT: 00000080 <End of list>
-; BOLT-NEXT: 000000a0 [[#%.16x,ADDR5:]] [[#%.16x,ADDR5B:]]
-=======
; BOLT-NEXT: 00000040 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
; BOLT-NEXT: 00000040 <End of list>
; BOLT-NEXT: 00000060 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
@@ -57,7 +47,6 @@
; BOLT-NEXT: 00000080 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
; BOLT-NEXT: 00000080 <End of list>
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
->>>>>>> c44da7cbd078 (Cleanup buffer initialization for DWO range writer instances)
; BOLT-NEXT: 000000a0 <End of list>
; BOLT: DW_TAG_compile_unit
@@ -74,17 +63,10 @@
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000023] = "helper.dwo.dwo")
; BOLT-NEXT: DW_AT_GNU_dwo_id
; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
-<<<<<<< HEAD
-; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x000000a0
-; BOLT-NEXT: [0x[[#ADDR5]], 0x[[#ADDR5B]])
-; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000010)
-; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000080)
-=======
; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000080
; BOLT-NEXT: [0x[[#ADDR3]], 0x[[#ADDRB3]])
; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000010)
; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000000a0)
->>>>>>> c44da7cbd078 (Cleanup buffer initialization for DWO range writer instances)
; PRE-BOLT-DWO-MAIN: version = 0x0004
; PRE-BOLT-DWO-MAIN: DW_TAG_compile_unit
>From 5d89c05356d06482a955d175f47a0a2525029868 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Mon, 8 Jul 2024 13:14:08 -0700
Subject: [PATCH 3/4] Update to test
Summary:
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
Differential Revision: https://phabricator.intern.facebook.com/D59489763
---
bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
index 750576037fe49..b429449cb3f32 100644
--- a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
+++ b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
@@ -71,7 +71,7 @@
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
>From 0b997d2b4fe9cc809758738232c5fbf2356101be Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Tue, 9 Jul 2024 17:38:00 -0700
Subject: [PATCH 4/4] Update initialization and remove test
---
bolt/include/bolt/Core/DebugData.h | 6 +-
bolt/lib/Core/DebugData.cpp | 6 +-
bolt/lib/Rewrite/DWARFRewriter.cpp | 5 +-
.../dwarf4-df-input-lowpc-ranges-cus-other.s | 604 ------------------
bolt/test/X86/debug-fission-single-convert.s | 6 +-
bolt/test/X86/dwarf4-df-dualcu.test | 6 +-
...4-df-input-lowpc-ranges-cus-no-blocks.test | 80 ---
.../X86/dwarf4-df-input-lowpc-ranges-cus.test | 8 +-
.../X86/dwarf4-df-input-lowpc-ranges.test | 4 +-
9 files changed, 22 insertions(+), 703 deletions(-)
delete mode 100644 bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s
delete mode 100644 bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
diff --git a/bolt/include/bolt/Core/DebugData.h b/bolt/include/bolt/Core/DebugData.h
index 3c2ad4a2497d5..2d200602e004a 100644
--- a/bolt/include/bolt/Core/DebugData.h
+++ b/bolt/include/bolt/Core/DebugData.h
@@ -205,9 +205,6 @@ class DebugRangesSectionWriter {
return std::move(RangesBuffer);
}
- /// Clears the ranges buffer.
- void clearBuffer() { RangesBuffer->clear(); }
-
RangesWriterKind getKind() const { return Kind; }
static bool classof(const DebugRangesSectionWriter *Writer) {
@@ -229,6 +226,9 @@ class DebugRangesSectionWriter {
/// Needs to be invoked before each \p CU is processed.
void virtual initSection(DWARFUnit &CU){};
+ /// Inits Ranges section with empty list.
+ void initSection();
+
protected:
std::unique_ptr<DebugBufferVector> RangesBuffer;
diff --git a/bolt/lib/Core/DebugData.cpp b/bolt/lib/Core/DebugData.cpp
index 579af3bce4eb8..d7d7c151d08fa 100644
--- a/bolt/lib/Core/DebugData.cpp
+++ b/bolt/lib/Core/DebugData.cpp
@@ -137,11 +137,13 @@ DebugRangesSectionWriter::DebugRangesSectionWriter() {
RangesBuffer = std::make_unique<DebugBufferVector>();
RangesStream = std::make_unique<raw_svector_ostream>(*RangesBuffer);
- // Add an empty range as the first entry;
- writeAddressRanges(*RangesStream.get(), DebugAddressRangesVector{});
Kind = RangesWriterKind::DebugRangesWriter;
}
+void DebugRangesSectionWriter::initSection() {
+ writeAddressRanges(*RangesStream.get(), DebugAddressRangesVector{});
+}
+
uint64_t DebugRangesSectionWriter::addRanges(
DebugAddressRangesVector &&Ranges,
std::map<DebugAddressRangesVector, uint64_t> &CachedRanges) {
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index c6b397cc57322..b871476f5fc49 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -620,8 +620,10 @@ void DWARFRewriter::updateDebugInfo() {
AddrWriter = std::make_unique<DebugAddrWriter>(&BC);
}
- if (BC.isDWARFLegacyUsed())
+ if (BC.isDWARFLegacyUsed()) {
LegacyRangesSectionWriter = std::make_unique<DebugRangesSectionWriter>();
+ LegacyRangesSectionWriter->initSection();
+ }
DebugLoclistWriter::setAddressWriter(AddrWriter.get());
@@ -651,7 +653,6 @@ void DWARFRewriter::updateDebugInfo() {
"LegacyRangeLists writer for DWO unit already exists.");
auto LegacyRangesSectionWriterByCU =
std::make_unique<DebugRangesSectionWriter>();
- LegacyRangesSectionWriterByCU->initSection(CU);
LegacyRangesSectionWriterByCU->clearBuffer();
LegacyRangesWritersByCU[*DWOId] =
std::move(LegacyRangesSectionWriterByCU);
diff --git a/bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s b/bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s
deleted file mode 100644
index da276b7340bfa..0000000000000
--- a/bolt/test/X86/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s
+++ /dev/null
@@ -1,604 +0,0 @@
-## clang++ -g2 -gdwarf-4 -gsplit-dwarf -fdebug-compilation-dir='.'
-## __attribute__((always_inline))
-## int doStuffOther(int val) {
-## if (val)
-## ++val;
-## return val;
-## }
-## __attribute__((always_inline))
-## int doStuffOther2(int val) {
-## int foo = 3;
-## return val + foo;
-## }
-##
-##
-## int mainOther(int argc, const char** argv) {
-## return doStuffOther(argc) + doStuffOther2(argc);;
-## }
- .text
- .file "mainOther.cpp"
- .globl _Z12doStuffOtheri # -- Begin function _Z12doStuffOtheri
- .p2align 4, 0x90
- .type _Z12doStuffOtheri, at function
-_Z12doStuffOtheri: # @_Z12doStuffOtheri
-.Lfunc_begin0:
- .file 1 "." "mainOther.cpp"
- .loc 1 2 0 # mainOther.cpp:2:0
- .cfi_startproc
-# %bb.0: # %entry
- pushq %rbp
- .cfi_def_cfa_offset 16
- .cfi_offset %rbp, -16
- movq %rsp, %rbp
- .cfi_def_cfa_register %rbp
- movl %edi, -4(%rbp)
-.Ltmp0:
- .loc 1 3 7 prologue_end # mainOther.cpp:3:7
- cmpl $0, -4(%rbp)
-.Ltmp1:
- .loc 1 3 7 is_stmt 0 # mainOther.cpp:3:7
- je .LBB0_2
-# %bb.1: # %if.then
-.Ltmp2:
- .loc 1 4 5 is_stmt 1 # mainOther.cpp:4:5
- movl -4(%rbp), %eax
- addl $1, %eax
- movl %eax, -4(%rbp)
-.Ltmp3:
-.LBB0_2: # %if.end
- .loc 1 5 10 # mainOther.cpp:5:10
- movl -4(%rbp), %eax
- .loc 1 5 3 epilogue_begin is_stmt 0 # mainOther.cpp:5:3
- popq %rbp
- .cfi_def_cfa %rsp, 8
- retq
-.Ltmp4:
-.Lfunc_end0:
- .size _Z12doStuffOtheri, .Lfunc_end0-_Z12doStuffOtheri
- .cfi_endproc
- # -- End function
- .globl _Z13doStuffOther2i # -- Begin function _Z13doStuffOther2i
- .p2align 4, 0x90
- .type _Z13doStuffOther2i, at function
-_Z13doStuffOther2i: # @_Z13doStuffOther2i
-.Lfunc_begin1:
- .loc 1 8 0 is_stmt 1 # mainOther.cpp:8:0
- .cfi_startproc
-# %bb.0: # %entry
- pushq %rbp
- .cfi_def_cfa_offset 16
- .cfi_offset %rbp, -16
- movq %rsp, %rbp
- .cfi_def_cfa_register %rbp
- movl %edi, -4(%rbp)
-.Ltmp5:
- .loc 1 9 7 prologue_end # mainOther.cpp:9:7
- movl $3, -8(%rbp)
- .loc 1 10 10 # mainOther.cpp:10:10
- movl -4(%rbp), %eax
- .loc 1 10 14 is_stmt 0 # mainOther.cpp:10:14
- addl -8(%rbp), %eax
- .loc 1 10 3 epilogue_begin # mainOther.cpp:10:3
- popq %rbp
- .cfi_def_cfa %rsp, 8
- retq
-.Ltmp6:
-.Lfunc_end1:
- .size _Z13doStuffOther2i, .Lfunc_end1-_Z13doStuffOther2i
- .cfi_endproc
- # -- End function
- .globl _Z9mainOtheriPPKc # -- Begin function _Z9mainOtheriPPKc
- .p2align 4, 0x90
- .type _Z9mainOtheriPPKc, at function
-_Z9mainOtheriPPKc: # @_Z9mainOtheriPPKc
-.Lfunc_begin2:
- .loc 1 13 0 is_stmt 1 # mainOther.cpp:13:0
- .cfi_startproc
-# %bb.0: # %entry
- pushq %rbp
- .cfi_def_cfa_offset 16
- .cfi_offset %rbp, -16
- movq %rsp, %rbp
- .cfi_def_cfa_register %rbp
- movl %edi, -16(%rbp)
- movq %rsi, -24(%rbp)
-.Ltmp7:
- .loc 1 14 25 prologue_end # mainOther.cpp:14:25
- movl -16(%rbp), %eax
- movl %eax, -12(%rbp)
-.Ltmp8:
- .loc 1 3 7 # mainOther.cpp:3:7
- cmpl $0, -12(%rbp)
-.Ltmp9:
- .loc 1 3 7 is_stmt 0 # mainOther.cpp:3:7
- je .LBB2_2
-# %bb.1: # %if.then.i
-.Ltmp10:
- .loc 1 4 5 is_stmt 1 # mainOther.cpp:4:5
- movl -12(%rbp), %eax
- addl $1, %eax
- movl %eax, -12(%rbp)
-.Ltmp11:
-.LBB2_2: # %_Z12doStuffOtheri.exit
- .loc 1 5 10 # mainOther.cpp:5:10
- movl -12(%rbp), %eax
-.Ltmp12:
- .loc 1 14 47 # mainOther.cpp:14:47
- movl -16(%rbp), %ecx
- movl %ecx, -4(%rbp)
-.Ltmp13:
- .loc 1 9 7 # mainOther.cpp:9:7
- movl $3, -8(%rbp)
- .loc 1 10 10 # mainOther.cpp:10:10
- movl -4(%rbp), %ecx
- .loc 1 10 14 is_stmt 0 # mainOther.cpp:10:14
- addl -8(%rbp), %ecx
-.Ltmp14:
- .loc 1 14 31 is_stmt 1 # mainOther.cpp:14:31
- addl %ecx, %eax
- .loc 1 14 5 epilogue_begin is_stmt 0 # mainOther.cpp:14:5
- popq %rbp
- .cfi_def_cfa %rsp, 8
- retq
-.Ltmp15:
-.Lfunc_end2:
- .size _Z9mainOtheriPPKc, .Lfunc_end2-_Z9mainOtheriPPKc
- .cfi_endproc
- # -- End function
- .section .debug_abbrev,"", at progbits
- .byte 1 # Abbreviation Code
- .byte 17 # DW_TAG_compile_unit
- .byte 0 # DW_CHILDREN_no
- .byte 16 # DW_AT_stmt_list
- .byte 23 # DW_FORM_sec_offset
- .byte 27 # DW_AT_comp_dir
- .byte 14 # DW_FORM_strp
- .ascii "\264B" # DW_AT_GNU_pubnames
- .byte 25 # DW_FORM_flag_present
- .ascii "\260B" # DW_AT_GNU_dwo_name
- .byte 14 # DW_FORM_strp
- .ascii "\261B" # DW_AT_GNU_dwo_id
- .byte 7 # DW_FORM_data8
- .byte 17 # DW_AT_low_pc
- .byte 1 # DW_FORM_addr
- .byte 18 # DW_AT_high_pc
- .byte 6 # DW_FORM_data4
- .ascii "\263B" # DW_AT_GNU_addr_base
- .byte 23 # DW_FORM_sec_offset
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 0 # EOM(3)
- .section .debug_info,"", at progbits
-.Lcu_begin0:
- .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
-.Ldebug_info_start0:
- .short 4 # DWARF version number
- .long .debug_abbrev # Offset Into Abbrev. Section
- .byte 8 # Address Size (in bytes)
- .byte 1 # Abbrev [1] 0xb:0x25 DW_TAG_compile_unit
- .long .Lline_table_start0 # DW_AT_stmt_list
- .long .Lskel_string0 # DW_AT_comp_dir
- # DW_AT_GNU_pubnames
- .long .Lskel_string1 # DW_AT_GNU_dwo_name
- .quad -1082921489565291703 # DW_AT_GNU_dwo_id
- .quad .Lfunc_begin0 # DW_AT_low_pc
- .long .Lfunc_end2-.Lfunc_begin0 # DW_AT_high_pc
- .long .Laddr_table_base0 # DW_AT_GNU_addr_base
-.Ldebug_info_end0:
- .section .debug_str,"MS", at progbits,1
-.Lskel_string0:
- .asciz "." # string offset=0
-.Lskel_string1:
- .asciz "mainOther.dwo" # string offset=2
- .section .debug_str.dwo,"eMS", at progbits,1
-.Linfo_string0:
- .asciz "_Z12doStuffOtheri" # string offset=0
-.Linfo_string1:
- .asciz "doStuffOther" # string offset=18
-.Linfo_string2:
- .asciz "int" # string offset=31
-.Linfo_string3:
- .asciz "val" # string offset=35
-.Linfo_string4:
- .asciz "_Z13doStuffOther2i" # string offset=39
-.Linfo_string5:
- .asciz "doStuffOther2" # string offset=58
-.Linfo_string6:
- .asciz "foo" # string offset=72
-.Linfo_string7:
- .asciz "_Z9mainOtheriPPKc" # string offset=76
-.Linfo_string8:
- .asciz "mainOther" # string offset=94
-.Linfo_string9:
- .asciz "argc" # string offset=104
-.Linfo_string10:
- .asciz "argv" # string offset=109
-.Linfo_string11:
- .asciz "char" # string offset=114
-.Linfo_string12:
- .asciz "clang version 19.0.0git (git at github.com:llvm/llvm-project.git df542e1ed82bd4e5a9e345d3a3ae63a76893a0cf)" # string offset=119
-.Linfo_string13:
- .asciz "mainOther.cpp" # string offset=223
-.Linfo_string14:
- .asciz "mainOther.dwo" # string offset=237
- .section .debug_str_offsets.dwo,"e", at progbits
- .long 0
- .long 18
- .long 31
- .long 35
- .long 39
- .long 58
- .long 72
- .long 76
- .long 94
- .long 104
- .long 109
- .long 114
- .long 119
- .long 223
- .long 237
- .section .debug_info.dwo,"e", at progbits
- .long .Ldebug_info_dwo_end0-.Ldebug_info_dwo_start0 # Length of Unit
-.Ldebug_info_dwo_start0:
- .short 4 # DWARF version number
- .long 0 # Offset Into Abbrev. Section
- .byte 8 # Address Size (in bytes)
- .byte 1 # Abbrev [1] 0xb:0xe1 DW_TAG_compile_unit
- .byte 12 # DW_AT_producer
- .short 33 # DW_AT_language
- .byte 13 # DW_AT_name
- .byte 14 # DW_AT_GNU_dwo_name
- .quad -1082921489565291703 # DW_AT_GNU_dwo_id
- .byte 2 # Abbrev [2] 0x19:0x15 DW_TAG_subprogram
- .byte 0 # DW_AT_low_pc
- .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
- .byte 1 # DW_AT_frame_base
- .byte 86
- .long 75 # DW_AT_abstract_origin
- .byte 3 # Abbrev [3] 0x25:0x8 DW_TAG_formal_parameter
- .byte 2 # DW_AT_location
- .byte 145
- .byte 124
- .long 85 # DW_AT_abstract_origin
- .byte 0 # End Of Children Mark
- .byte 2 # Abbrev [2] 0x2e:0x1d DW_TAG_subprogram
- .byte 1 # DW_AT_low_pc
- .long .Lfunc_end1-.Lfunc_begin1 # DW_AT_high_pc
- .byte 1 # DW_AT_frame_base
- .byte 86
- .long 98 # DW_AT_abstract_origin
- .byte 3 # Abbrev [3] 0x3a:0x8 DW_TAG_formal_parameter
- .byte 2 # DW_AT_location
- .byte 145
- .byte 124
- .long 108 # DW_AT_abstract_origin
- .byte 4 # Abbrev [4] 0x42:0x8 DW_TAG_variable
- .byte 2 # DW_AT_location
- .byte 145
- .byte 120
- .long 116 # DW_AT_abstract_origin
- .byte 0 # End Of Children Mark
- .byte 5 # Abbrev [5] 0x4b:0x13 DW_TAG_subprogram
- .byte 0 # DW_AT_linkage_name
- .byte 1 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 2 # DW_AT_decl_line
- .long 94 # DW_AT_type
- # DW_AT_external
- .byte 1 # DW_AT_inline
- .byte 6 # Abbrev [6] 0x55:0x8 DW_TAG_formal_parameter
- .byte 3 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 2 # DW_AT_decl_line
- .long 94 # DW_AT_type
- .byte 0 # End Of Children Mark
- .byte 7 # Abbrev [7] 0x5e:0x4 DW_TAG_base_type
- .byte 2 # DW_AT_name
- .byte 5 # DW_AT_encoding
- .byte 4 # DW_AT_byte_size
- .byte 5 # Abbrev [5] 0x62:0x1b DW_TAG_subprogram
- .byte 4 # DW_AT_linkage_name
- .byte 5 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 8 # DW_AT_decl_line
- .long 94 # DW_AT_type
- # DW_AT_external
- .byte 1 # DW_AT_inline
- .byte 6 # Abbrev [6] 0x6c:0x8 DW_TAG_formal_parameter
- .byte 3 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 8 # DW_AT_decl_line
- .long 94 # DW_AT_type
- .byte 8 # Abbrev [8] 0x74:0x8 DW_TAG_variable
- .byte 6 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 9 # DW_AT_decl_line
- .long 94 # DW_AT_type
- .byte 0 # End Of Children Mark
- .byte 9 # Abbrev [9] 0x7d:0x5b DW_TAG_subprogram
- .byte 2 # DW_AT_low_pc
- .long .Lfunc_end2-.Lfunc_begin2 # DW_AT_high_pc
- .byte 1 # DW_AT_frame_base
- .byte 86
- .byte 7 # DW_AT_linkage_name
- .byte 8 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 13 # DW_AT_decl_line
- .long 94 # DW_AT_type
- # DW_AT_external
- .byte 10 # Abbrev [10] 0x8d:0xb DW_TAG_formal_parameter
- .byte 2 # DW_AT_location
- .byte 145
- .byte 112
- .byte 9 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 13 # DW_AT_decl_line
- .long 94 # DW_AT_type
- .byte 10 # Abbrev [10] 0x98:0xb DW_TAG_formal_parameter
- .byte 2 # DW_AT_location
- .byte 145
- .byte 104
- .byte 10 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 13 # DW_AT_decl_line
- .long 216 # DW_AT_type
- .byte 11 # Abbrev [11] 0xa3:0x16 DW_TAG_inlined_subroutine
- .long 75 # DW_AT_abstract_origin
- .byte 3 # DW_AT_low_pc
- .long .Ltmp12-.Ltmp8 # DW_AT_high_pc
- .byte 1 # DW_AT_call_file
- .byte 14 # DW_AT_call_line
- .byte 12 # DW_AT_call_column
- .byte 3 # Abbrev [3] 0xb0:0x8 DW_TAG_formal_parameter
- .byte 2 # DW_AT_location
- .byte 145
- .byte 116
- .long 85 # DW_AT_abstract_origin
- .byte 0 # End Of Children Mark
- .byte 11 # Abbrev [11] 0xb9:0x1e DW_TAG_inlined_subroutine
- .long 98 # DW_AT_abstract_origin
- .byte 4 # DW_AT_low_pc
- .long .Ltmp14-.Ltmp13 # DW_AT_high_pc
- .byte 1 # DW_AT_call_file
- .byte 14 # DW_AT_call_line
- .byte 33 # DW_AT_call_column
- .byte 3 # Abbrev [3] 0xc6:0x8 DW_TAG_formal_parameter
- .byte 2 # DW_AT_location
- .byte 145
- .byte 124
- .long 108 # DW_AT_abstract_origin
- .byte 4 # Abbrev [4] 0xce:0x8 DW_TAG_variable
- .byte 2 # DW_AT_location
- .byte 145
- .byte 120
- .long 116 # DW_AT_abstract_origin
- .byte 0 # End Of Children Mark
- .byte 0 # End Of Children Mark
- .byte 12 # Abbrev [12] 0xd8:0x5 DW_TAG_pointer_type
- .long 221 # DW_AT_type
- .byte 12 # Abbrev [12] 0xdd:0x5 DW_TAG_pointer_type
- .long 226 # DW_AT_type
- .byte 13 # Abbrev [13] 0xe2:0x5 DW_TAG_const_type
- .long 231 # DW_AT_type
- .byte 7 # Abbrev [7] 0xe7:0x4 DW_TAG_base_type
- .byte 11 # DW_AT_name
- .byte 6 # DW_AT_encoding
- .byte 1 # DW_AT_byte_size
- .byte 0 # End Of Children Mark
-.Ldebug_info_dwo_end0:
- .section .debug_abbrev.dwo,"e", at progbits
- .byte 1 # Abbreviation Code
- .byte 17 # DW_TAG_compile_unit
- .byte 1 # DW_CHILDREN_yes
- .byte 37 # DW_AT_producer
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 19 # DW_AT_language
- .byte 5 # DW_FORM_data2
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .ascii "\260B" # DW_AT_GNU_dwo_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .ascii "\261B" # DW_AT_GNU_dwo_id
- .byte 7 # DW_FORM_data8
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 2 # Abbreviation Code
- .byte 46 # DW_TAG_subprogram
- .byte 1 # DW_CHILDREN_yes
- .byte 17 # DW_AT_low_pc
- .ascii "\201>" # DW_FORM_GNU_addr_index
- .byte 18 # DW_AT_high_pc
- .byte 6 # DW_FORM_data4
- .byte 64 # DW_AT_frame_base
- .byte 24 # DW_FORM_exprloc
- .byte 49 # DW_AT_abstract_origin
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 3 # Abbreviation Code
- .byte 5 # DW_TAG_formal_parameter
- .byte 0 # DW_CHILDREN_no
- .byte 2 # DW_AT_location
- .byte 24 # DW_FORM_exprloc
- .byte 49 # DW_AT_abstract_origin
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 4 # Abbreviation Code
- .byte 52 # DW_TAG_variable
- .byte 0 # DW_CHILDREN_no
- .byte 2 # DW_AT_location
- .byte 24 # DW_FORM_exprloc
- .byte 49 # DW_AT_abstract_origin
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 5 # Abbreviation Code
- .byte 46 # DW_TAG_subprogram
- .byte 1 # DW_CHILDREN_yes
- .byte 110 # DW_AT_linkage_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 58 # DW_AT_decl_file
- .byte 11 # DW_FORM_data1
- .byte 59 # DW_AT_decl_line
- .byte 11 # DW_FORM_data1
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 63 # DW_AT_external
- .byte 25 # DW_FORM_flag_present
- .byte 32 # DW_AT_inline
- .byte 11 # DW_FORM_data1
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 6 # Abbreviation Code
- .byte 5 # DW_TAG_formal_parameter
- .byte 0 # DW_CHILDREN_no
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 58 # DW_AT_decl_file
- .byte 11 # DW_FORM_data1
- .byte 59 # DW_AT_decl_line
- .byte 11 # DW_FORM_data1
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 7 # Abbreviation Code
- .byte 36 # DW_TAG_base_type
- .byte 0 # DW_CHILDREN_no
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 62 # DW_AT_encoding
- .byte 11 # DW_FORM_data1
- .byte 11 # DW_AT_byte_size
- .byte 11 # DW_FORM_data1
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 8 # Abbreviation Code
- .byte 52 # DW_TAG_variable
- .byte 0 # DW_CHILDREN_no
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 58 # DW_AT_decl_file
- .byte 11 # DW_FORM_data1
- .byte 59 # DW_AT_decl_line
- .byte 11 # DW_FORM_data1
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 9 # Abbreviation Code
- .byte 46 # DW_TAG_subprogram
- .byte 1 # DW_CHILDREN_yes
- .byte 17 # DW_AT_low_pc
- .ascii "\201>" # DW_FORM_GNU_addr_index
- .byte 18 # DW_AT_high_pc
- .byte 6 # DW_FORM_data4
- .byte 64 # DW_AT_frame_base
- .byte 24 # DW_FORM_exprloc
- .byte 110 # DW_AT_linkage_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 58 # DW_AT_decl_file
- .byte 11 # DW_FORM_data1
- .byte 59 # DW_AT_decl_line
- .byte 11 # DW_FORM_data1
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 63 # DW_AT_external
- .byte 25 # DW_FORM_flag_present
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 10 # Abbreviation Code
- .byte 5 # DW_TAG_formal_parameter
- .byte 0 # DW_CHILDREN_no
- .byte 2 # DW_AT_location
- .byte 24 # DW_FORM_exprloc
- .byte 3 # DW_AT_name
- .ascii "\202>" # DW_FORM_GNU_str_index
- .byte 58 # DW_AT_decl_file
- .byte 11 # DW_FORM_data1
- .byte 59 # DW_AT_decl_line
- .byte 11 # DW_FORM_data1
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 11 # Abbreviation Code
- .byte 29 # DW_TAG_inlined_subroutine
- .byte 1 # DW_CHILDREN_yes
- .byte 49 # DW_AT_abstract_origin
- .byte 19 # DW_FORM_ref4
- .byte 17 # DW_AT_low_pc
- .ascii "\201>" # DW_FORM_GNU_addr_index
- .byte 18 # DW_AT_high_pc
- .byte 6 # DW_FORM_data4
- .byte 88 # DW_AT_call_file
- .byte 11 # DW_FORM_data1
- .byte 89 # DW_AT_call_line
- .byte 11 # DW_FORM_data1
- .byte 87 # DW_AT_call_column
- .byte 11 # DW_FORM_data1
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 12 # Abbreviation Code
- .byte 15 # DW_TAG_pointer_type
- .byte 0 # DW_CHILDREN_no
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 13 # Abbreviation Code
- .byte 38 # DW_TAG_const_type
- .byte 0 # DW_CHILDREN_no
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 0 # EOM(3)
- .section .debug_addr,"", at progbits
-.Laddr_table_base0:
- .quad .Lfunc_begin0
- .quad .Lfunc_begin1
- .quad .Lfunc_begin2
- .quad .Ltmp8
- .quad .Ltmp13
- .section .debug_gnu_pubnames,"", at progbits
- .long .LpubNames_end0-.LpubNames_start0 # Length of Public Names Info
-.LpubNames_start0:
- .short 2 # DWARF Version
- .long .Lcu_begin0 # Offset of Compilation Unit Info
- .long 48 # Compilation Unit Length
- .long 75 # DIE offset
- .byte 48 # Attributes: FUNCTION, EXTERNAL
- .asciz "doStuffOther" # External Name
- .long 98 # DIE offset
- .byte 48 # Attributes: FUNCTION, EXTERNAL
- .asciz "doStuffOther2" # External Name
- .long 125 # DIE offset
- .byte 48 # Attributes: FUNCTION, EXTERNAL
- .asciz "mainOther" # External Name
- .long 0 # End Mark
-.LpubNames_end0:
- .section .debug_gnu_pubtypes,"", at progbits
- .long .LpubTypes_end0-.LpubTypes_start0 # Length of Public Types Info
-.LpubTypes_start0:
- .short 2 # DWARF Version
- .long .Lcu_begin0 # Offset of Compilation Unit Info
- .long 48 # Compilation Unit Length
- .long 94 # DIE offset
- .byte 144 # Attributes: TYPE, STATIC
- .asciz "int" # External Name
- .long 231 # DIE offset
- .byte 144 # Attributes: TYPE, STATIC
- .asciz "char" # External Name
- .long 0 # End Mark
-.LpubTypes_end0:
- .ident "clang version 19.0.0git (git at github.com:llvm/llvm-project.git df542e1ed82bd4e5a9e345d3a3ae63a76893a0cf)"
- .section ".note.GNU-stack","", at progbits
- .addrsig
- .section .debug_line,"", at progbits
-.Lline_table_start0:
diff --git a/bolt/test/X86/debug-fission-single-convert.s b/bolt/test/X86/debug-fission-single-convert.s
index bb0b790157123..5ea6eb8e353af 100644
--- a/bolt/test/X86/debug-fission-single-convert.s
+++ b/bolt/test/X86/debug-fission-single-convert.s
@@ -31,11 +31,11 @@
# CHECK-DWO-DWO: 00000010
# CHECK-DWO-DWO: 00000010
# CHECK-DWO-DWO: DW_TAG_subprogram
-# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
# CHECK-DWO-DWO: DW_TAG_subprogram
-# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000030
+# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000020
# CHECK-DWO-DWO: DW_TAG_subprogram
-# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
+# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
# CHECK-ADDR-SEC: .debug_addr contents:
# CHECK-ADDR-SEC: 0x00000000: Addrs: [
diff --git a/bolt/test/X86/dwarf4-df-dualcu.test b/bolt/test/X86/dwarf4-df-dualcu.test
index 5a1caa1ce065d..468c924de3a90 100644
--- a/bolt/test/X86/dwarf4-df-dualcu.test
+++ b/bolt/test/X86/dwarf4-df-dualcu.test
@@ -113,13 +113,13 @@
; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_GNU_addr_index 0x1)
; BOLT-DWO-MAIN: DW_TAG_subprogram [4]
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
; BOLT-DWO-MAIN-NEXT: )
; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
; BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_GNU_str_index] (indexed (00000003) string = "_Z3usePiS_")
; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000004) string = "use")
; BOLT-DWO-MAIN: DW_TAG_subprogram [6]
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000030
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000020
; BOLT-DWO-MAIN-NEXT: )
; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base [DW_FORM_exprloc] (DW_OP_reg6 RBP)
; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000005) string = "main")
@@ -160,4 +160,4 @@
; BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_GNU_addr_index 0x1)
; BOLT-DWO-HELPER: DW_TAG_subprogram [4]
-; BOLT-DWO-HELPER-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+; BOLT-DWO-HELPER-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
deleted file mode 100644
index b429449cb3f32..0000000000000
--- a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus-no-blocks.test
+++ /dev/null
@@ -1,80 +0,0 @@
-; RUN: rm -rf %t
-; RUN: mkdir %t
-; RUN: cd %t
-; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-input-lowpc-ranges-main.s \
-; RUN: -split-dwarf-file=main.dwo -o main.o
-; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-input-lowpc-ranges-cus-other.s \
-; RUN: -split-dwarf-file=mainOther.dwo -o other.o
-; RUN: %clang %cflags -gdwarf-4 -gsplit-dwarf=split main.o other.o -o main.exe
-; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
-; RUN: llvm-dwarfdump --show-form --verbose --debug-ranges main.exe.bolt &> %t/foo.txt
-; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt
-; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s
-; RUN: not llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo mainOther.dwo.dwo &> %t/mainddwodwo.txt
-; RUN: cat %t/mainddwodwo.txt | FileCheck -check-prefix=BOLT-DWO-MAIN %s
-
-;; Tests that BOLT correctly handles mixed input with DW_AT_high_pc/DW_at_low_pc and DW_AT_low_pc/DW_AT_ranges.
-
-; BOLT: .debug_ranges
-; BOLT-NEXT: 00000000 <End of list>
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR4:]] [[#%.16x,ADDRB4:]]
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
-; BOLT-NEXT: 00000010 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
-; BOLT-NEXT: 00000010 <End of list>
-; BOLT-NEXT: 00000090 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
-; BOLT-NEXT: 00000090 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
-; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
-; BOLT-NEXT: 00000090 <End of list>
-; BOLT-NEXT: 000000d0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
-; BOLT-NEXT: 000000d0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
-; BOLT-NEXT: 000000d0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
-; BOLT-NEXT: 000000d0 <End of list>
-; BOLT-NEXT: 00000110 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
-; BOLT-NEXT: 00000110 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
-; BOLT-NEXT: 00000110 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
-; BOLT-NEXT: 00000110 <End of list>
-
-; BOLT: DW_TAG_compile_unit
-; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "main.dwo.dwo")
-; BOLT-NEXT: DW_AT_GNU_dwo_id
-; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000090)
-; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
-; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
-; BOLT-NEXT: [0x[[#ADDR1]], 0x[[#ADDRB1]])
-; BOLT-NEXT: [0x[[#ADDR2]], 0x[[#ADDRB2]])
-; BOLT-NEXT: [0x[[#ADDR3]], 0x[[#ADDRB3]])
-; BOLT-NEXT: [0x[[#ADDR4]], 0x[[#ADDRB4]])
-; BOLT-NEXT: [0x[[#ADDR5]], 0x[[#ADDRB5]])
-; BOLT-NEXT: [0x[[#ADDR6]], 0x[[#ADDRB6]])
-; BOLT-NEXT: [0x[[#ADDR7]], 0x[[#ADDRB7]])
-; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000000)
-; BOLT-NEXT: Compile Unit
-
-; BOLT: DW_TAG_compile_unit
-; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "mainOther.dwo.dwo")
-; BOLT-NEXT: DW_AT_GNU_dwo_id
-; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
-; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000110
-; BOLT-NEXT: [0x[[#ADDR8]], 0x[[#ADDRB8]])
-; BOLT-NEXT: [0x[[#ADDR9]], 0x[[#ADDRB9]])
-; BOLT-NEXT: [0x[[#ADDR10]], 0x[[#ADDRB10]])
-; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000018)
-; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000150)
-; BOLT: {{^$}}
-
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
-
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN: DW_TAG_subprogram
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test
index ecf08969c17d3..a97377400eeb7 100644
--- a/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test
+++ b/bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test
@@ -83,17 +83,17 @@
; BOLT: {{^$}}
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
diff --git a/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test b/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test
index 5552ef102f115..0cf8d433700c7 100644
--- a/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test
+++ b/bolt/test/X86/dwarf4-df-input-lowpc-ranges.test
@@ -48,9 +48,9 @@
; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000000)
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
; BOLT-DWO-MAIN: DW_TAG_subprogram
-; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
More information about the llvm-commits
mailing list