Reland "Symbolize line zero as if no source info is available (#124846)" #133798
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…24846)" This land commits 23aca2f and 1b15a89. llvm#128619 makes symbolizer to always use debug info when available so we can reland this chagnge.
|
@llvm/pr-subscribers-llvm-binary-utilities @llvm/pr-subscribers-offload Author: Zequan Wu (ZequanWu) ChangesThis land commits 23aca2f and 1b15a89. #128619 makes symbolizer to always use debug info when available so we can reland this chagnge. Full diff: https://github.com/llvm/llvm-project/pull/133798.diff 8 Files Affected:
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index e76e518ef8595..9c5d43dd4fb77 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1870,7 +1870,7 @@ DWARFContext::getInliningInfoForAddress(object::SectionedAddress Address,
LineTable->getFileLineInfoForAddress(
{Address.Address, Address.SectionIndex}, Spec.ApproximateLine,
CU->getCompilationDir(), Spec.FLIKind, Frame);
- } else {
+ } else if (CallLine != 0) {
// Otherwise, use call file, call line and call column from
// previous DIE in inlined chain.
if (LineTable)
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
index 55a3bfa459c3c..62bf3d4ecaaf0 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
@@ -1539,7 +1539,8 @@ bool DWARFDebugLine::LineTable::getFileLineInfoForAddress(
return false;
// Take file number and line/column from the row.
const auto &Row = Rows[RowIndex];
- if (!getFileNameByIndex(Row.File, CompDir, Kind, Result.FileName))
+ if (Row.Line == 0 ||
+ !getFileNameByIndex(Row.File, CompDir, Kind, Result.FileName))
return false;
Result.Line = Row.Line;
Result.Column = Row.Column;
diff --git a/llvm/test/tools/llvm-symbolizer/skip-line-zero.s b/llvm/test/tools/llvm-symbolizer/skip-line-zero.s
index e9fbea558e0eb..74dfb5cdc1aae 100644
--- a/llvm/test/tools/llvm-symbolizer/skip-line-zero.s
+++ b/llvm/test/tools/llvm-symbolizer/skip-line-zero.s
@@ -20,13 +20,13 @@
## Check that without '--skip-line-zero', line zero is displayed for a line-table entry which has no source correspondence.
# RUN: llvm-symbolizer --obj=%t.o -f=none 0x16d4 | FileCheck --strict-whitespace --match-full-lines --check-prefix=DISABLE %s
-# DISABLE:main.c:0:0
+# DISABLE:??:0:0
## Check that the '--skip-line-zero' does not cross sequence boundaries.
## If it fails to find in the current sequence then line zero is returned for the queried address.
# RUN: llvm-symbolizer --obj=%t.o -f=none --skip-line-zero 0x16c0 | FileCheck --strict-whitespace --match-full-lines --check-prefix=FAIL-ACROSS-SEQ %s
-# FAIL-ACROSS-SEQ:main.c:0:0
+# FAIL-ACROSS-SEQ:??:0:0
## Check that with '--skip-line-zero', the last non-zero line in the current sequence is displayed.
# RUN: llvm-symbolizer --obj=%t.o -f=none --skip-line-zero 0x1717 | FileCheck --strict-whitespace --match-full-lines --check-prefix=WITHIN-SEQ %s
diff --git a/llvm/test/tools/llvm-symbolizer/sym-verbose.test b/llvm/test/tools/llvm-symbolizer/sym-verbose.test
index 831fd6c7f0507..224c317f558a1 100644
--- a/llvm/test/tools/llvm-symbolizer/sym-verbose.test
+++ b/llvm/test/tools/llvm-symbolizer/sym-verbose.test
@@ -50,13 +50,12 @@ CHECK-NEXT: Column: 0
CHECK: 0x4005ad
CHECK-NEXT: foo
-CHECK-NEXT: Filename: /tmp{{[\\/]}}discrim.c
+CHECK-NEXT: Filename: ??
CHECK-NEXT: Function start filename: /tmp{{[\\/]}}discrim.c
CHECK-NEXT: Function start line: 4
CHECK-NEXT: Function start address: 0x400590
CHECK-NEXT: Line: 0
-CHECK-NEXT: Column: 30
-CHECK-NEXT: Discriminator: 4
+CHECK-NEXT: Column: 0
CHECK-NEXT: main
CHECK-NEXT: Filename: /tmp{{[\\/]}}discrim.c
CHECK-NEXT: Function start filename: /tmp{{[\\/]}}discrim.c
diff --git a/offload/test/sanitizer/kernel_crash_many.c b/offload/test/sanitizer/kernel_crash_many.c
index f1d17ca2b76e2..9fd8af48f51fe 100644
--- a/offload/test/sanitizer/kernel_crash_many.c
+++ b/offload/test/sanitizer/kernel_crash_many.c
@@ -37,36 +37,36 @@ int main(void) {
// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 3: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 4: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 5: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 6: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 7: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK-NOT: Kernel {{[[0-9]]+}}:
diff --git a/offload/test/sanitizer/kernel_trap.c b/offload/test/sanitizer/kernel_trap.c
index 7a166bfda5ee9..3a531bd74c980 100644
--- a/offload/test/sanitizer/kernel_trap.c
+++ b/offload/test/sanitizer/kernel_trap.c
@@ -39,5 +39,4 @@ int main(void) {
// CHECK: OFFLOAD ERROR: Kernel 'omp target in main @ 30 (__omp_offloading_{{.*}}_main_l30)'
// CHECK: OFFLOAD ERROR: execution interrupted by hardware trap instruction
// TRACE: launchKernel
-// TRACE: main
// clang-format on
diff --git a/offload/test/sanitizer/kernel_trap.cpp b/offload/test/sanitizer/kernel_trap.cpp
index c67b3857fabba..44858be6cd3f6 100644
--- a/offload/test/sanitizer/kernel_trap.cpp
+++ b/offload/test/sanitizer/kernel_trap.cpp
@@ -47,6 +47,6 @@ int main(void) {
// TRACE: launchKernel
// NDEBG: cxx_function_name<S>(int, S*)
// NDEBG: main
-// DEBUG: cxx_function_name<S>(int, S*) {{.*}}kernel_trap.cpp:
-// DEBUG: main {{.*}}kernel_trap.cpp:
+// DEBUG: cxx_function_name<S>(int, S*) {{.*}}kernel_trap.cpp
+// DEBUG: main {{.*}}kernel_trap.cpp
// clang-format on
diff --git a/offload/test/sanitizer/kernel_trap_many.c b/offload/test/sanitizer/kernel_trap_many.c
index f2e63794168b2..061c0fe225d4b 100644
--- a/offload/test/sanitizer/kernel_trap_many.c
+++ b/offload/test/sanitizer/kernel_trap_many.c
@@ -32,4 +32,4 @@ int main(void) {
// TRACE: OFFLOAD ERROR: execution interrupted by hardware trap instruction
// TRACE: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_trap_many.c:
+// DEBUG: main {{.*}}kernel_trap_many.c
|
|
@llvm/pr-subscribers-debuginfo Author: Zequan Wu (ZequanWu) ChangesThis land commits 23aca2f and 1b15a89. #128619 makes symbolizer to always use debug info when available so we can reland this chagnge. Full diff: https://github.com/llvm/llvm-project/pull/133798.diff 8 Files Affected:
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index e76e518ef8595..9c5d43dd4fb77 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1870,7 +1870,7 @@ DWARFContext::getInliningInfoForAddress(object::SectionedAddress Address,
LineTable->getFileLineInfoForAddress(
{Address.Address, Address.SectionIndex}, Spec.ApproximateLine,
CU->getCompilationDir(), Spec.FLIKind, Frame);
- } else {
+ } else if (CallLine != 0) {
// Otherwise, use call file, call line and call column from
// previous DIE in inlined chain.
if (LineTable)
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
index 55a3bfa459c3c..62bf3d4ecaaf0 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
@@ -1539,7 +1539,8 @@ bool DWARFDebugLine::LineTable::getFileLineInfoForAddress(
return false;
// Take file number and line/column from the row.
const auto &Row = Rows[RowIndex];
- if (!getFileNameByIndex(Row.File, CompDir, Kind, Result.FileName))
+ if (Row.Line == 0 ||
+ !getFileNameByIndex(Row.File, CompDir, Kind, Result.FileName))
return false;
Result.Line = Row.Line;
Result.Column = Row.Column;
diff --git a/llvm/test/tools/llvm-symbolizer/skip-line-zero.s b/llvm/test/tools/llvm-symbolizer/skip-line-zero.s
index e9fbea558e0eb..74dfb5cdc1aae 100644
--- a/llvm/test/tools/llvm-symbolizer/skip-line-zero.s
+++ b/llvm/test/tools/llvm-symbolizer/skip-line-zero.s
@@ -20,13 +20,13 @@
## Check that without '--skip-line-zero', line zero is displayed for a line-table entry which has no source correspondence.
# RUN: llvm-symbolizer --obj=%t.o -f=none 0x16d4 | FileCheck --strict-whitespace --match-full-lines --check-prefix=DISABLE %s
-# DISABLE:main.c:0:0
+# DISABLE:??:0:0
## Check that the '--skip-line-zero' does not cross sequence boundaries.
## If it fails to find in the current sequence then line zero is returned for the queried address.
# RUN: llvm-symbolizer --obj=%t.o -f=none --skip-line-zero 0x16c0 | FileCheck --strict-whitespace --match-full-lines --check-prefix=FAIL-ACROSS-SEQ %s
-# FAIL-ACROSS-SEQ:main.c:0:0
+# FAIL-ACROSS-SEQ:??:0:0
## Check that with '--skip-line-zero', the last non-zero line in the current sequence is displayed.
# RUN: llvm-symbolizer --obj=%t.o -f=none --skip-line-zero 0x1717 | FileCheck --strict-whitespace --match-full-lines --check-prefix=WITHIN-SEQ %s
diff --git a/llvm/test/tools/llvm-symbolizer/sym-verbose.test b/llvm/test/tools/llvm-symbolizer/sym-verbose.test
index 831fd6c7f0507..224c317f558a1 100644
--- a/llvm/test/tools/llvm-symbolizer/sym-verbose.test
+++ b/llvm/test/tools/llvm-symbolizer/sym-verbose.test
@@ -50,13 +50,12 @@ CHECK-NEXT: Column: 0
CHECK: 0x4005ad
CHECK-NEXT: foo
-CHECK-NEXT: Filename: /tmp{{[\\/]}}discrim.c
+CHECK-NEXT: Filename: ??
CHECK-NEXT: Function start filename: /tmp{{[\\/]}}discrim.c
CHECK-NEXT: Function start line: 4
CHECK-NEXT: Function start address: 0x400590
CHECK-NEXT: Line: 0
-CHECK-NEXT: Column: 30
-CHECK-NEXT: Discriminator: 4
+CHECK-NEXT: Column: 0
CHECK-NEXT: main
CHECK-NEXT: Filename: /tmp{{[\\/]}}discrim.c
CHECK-NEXT: Function start filename: /tmp{{[\\/]}}discrim.c
diff --git a/offload/test/sanitizer/kernel_crash_many.c b/offload/test/sanitizer/kernel_crash_many.c
index f1d17ca2b76e2..9fd8af48f51fe 100644
--- a/offload/test/sanitizer/kernel_crash_many.c
+++ b/offload/test/sanitizer/kernel_crash_many.c
@@ -37,36 +37,36 @@ int main(void) {
// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 3: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 4: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 5: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 6: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK: Kernel 7: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c:
+// DEBUG: main {{.*}}kernel_crash_many.c
//
// CHECK-NOT: Kernel {{[[0-9]]+}}:
diff --git a/offload/test/sanitizer/kernel_trap.c b/offload/test/sanitizer/kernel_trap.c
index 7a166bfda5ee9..3a531bd74c980 100644
--- a/offload/test/sanitizer/kernel_trap.c
+++ b/offload/test/sanitizer/kernel_trap.c
@@ -39,5 +39,4 @@ int main(void) {
// CHECK: OFFLOAD ERROR: Kernel 'omp target in main @ 30 (__omp_offloading_{{.*}}_main_l30)'
// CHECK: OFFLOAD ERROR: execution interrupted by hardware trap instruction
// TRACE: launchKernel
-// TRACE: main
// clang-format on
diff --git a/offload/test/sanitizer/kernel_trap.cpp b/offload/test/sanitizer/kernel_trap.cpp
index c67b3857fabba..44858be6cd3f6 100644
--- a/offload/test/sanitizer/kernel_trap.cpp
+++ b/offload/test/sanitizer/kernel_trap.cpp
@@ -47,6 +47,6 @@ int main(void) {
// TRACE: launchKernel
// NDEBG: cxx_function_name<S>(int, S*)
// NDEBG: main
-// DEBUG: cxx_function_name<S>(int, S*) {{.*}}kernel_trap.cpp:
-// DEBUG: main {{.*}}kernel_trap.cpp:
+// DEBUG: cxx_function_name<S>(int, S*) {{.*}}kernel_trap.cpp
+// DEBUG: main {{.*}}kernel_trap.cpp
// clang-format on
diff --git a/offload/test/sanitizer/kernel_trap_many.c b/offload/test/sanitizer/kernel_trap_many.c
index f2e63794168b2..061c0fe225d4b 100644
--- a/offload/test/sanitizer/kernel_trap_many.c
+++ b/offload/test/sanitizer/kernel_trap_many.c
@@ -32,4 +32,4 @@ int main(void) {
// TRACE: OFFLOAD ERROR: execution interrupted by hardware trap instruction
// TRACE: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_trap_many.c:
+// DEBUG: main {{.*}}kernel_trap_many.c
|
dwblaikie
approved these changes
Mar 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This land commits 23aca2f and 1b15a89. #128619 makes symbolizer to always use debug info when available so we can reland this chagnge.