[PowerPC] Only set QualName symbol on first section switch#179253
Merged
[PowerPC] Only set QualName symbol on first section switch#179253
Conversation
We were setting it every time when switching to the section. This caused problems when the debug_aranges emission performed a switch at the end of the section, resulting in symbols incorrectly pointing to the end instead of the start of the function.
Member
|
@llvm/pr-subscribers-llvm-mc @llvm/pr-subscribers-backend-powerpc Author: Nikita Popov (nikic) ChangesWe were setting it every time when switching to the section. This caused problems when the debug_aranges emission performed a switch at the end of the section, resulting in symbols incorrectly pointing to the end instead of the start of the function. Full diff: https://github.com/llvm/llvm-project/pull/179253.diff 2 Files Affected:
diff --git a/llvm/lib/MC/MCXCOFFStreamer.cpp b/llvm/lib/MC/MCXCOFFStreamer.cpp
index 4bf14c11068cb..b459b26045ae7 100644
--- a/llvm/lib/MC/MCXCOFFStreamer.cpp
+++ b/llvm/lib/MC/MCXCOFFStreamer.cpp
@@ -45,8 +45,12 @@ void MCXCOFFStreamer::changeSection(MCSection *Section, uint32_t Subsection) {
// sections because we don't have other cases that hit this problem yet.
// if (IsDwarfSec || CsectProp->MappingClass == XCOFF::XMC_PR)
// QualName->setFragment(F);
- if (Sec->isDwarfSect() || Sec->getMappingClass() == XCOFF::XMC_PR)
- Sec->getQualNameSymbol()->setFragment(CurFrag);
+ if (Sec->isDwarfSect() || Sec->getMappingClass() == XCOFF::XMC_PR) {
+ MCSymbol *QualNameSymbol = Sec->getQualNameSymbol();
+ // Only set the fragment the first time we're switching to the section.
+ if (!QualNameSymbol->isInSection())
+ QualNameSymbol->setFragment(CurFrag);
+ }
}
bool MCXCOFFStreamer::emitSymbolAttribute(MCSymbol *Sym,
diff --git a/llvm/test/CodeGen/PowerPC/aix-debug-aranges.ll b/llvm/test/CodeGen/PowerPC/aix-debug-aranges.ll
new file mode 100644
index 0000000000000..7b850b6f2a2d0
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/aix-debug-aranges.ll
@@ -0,0 +1,28 @@
+; RUN: llc -filetype=obj -function-sections -generate-arange-section < %s | \
+; RUN: llvm-objdump -dr - | FileCheck %s
+
+; Make sure that enabling debug_arange does not corrupt branches.
+
+target triple = "powerpc64-ibm-aix"
+
+define i64 @fn1() {
+; CHECK-LABEL: <.fn1>:
+; CHECK: bl {{.*}} <.fn2>
+; CHECK-NEXT: R_RBR .fn2
+ %1 = call i64 @fn2()
+ ret i64 %1
+}
+
+define i64 @fn2() !dbg !4 {
+ ret i64 0
+}
+
+!llvm.module.flags = !{!0}
+!llvm.dbg.cu = !{!1}
+
+!0 = !{i32 2, !"Debug Info Version", i32 3}
+!1 = distinct !DICompileUnit(language: DW_LANG_Rust, file: !2, producer: "clang LLVM (rustc version 1.95.0-dev)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !3, globals: !3, splitDebugInlining: false, nameTableKind: None)
+!2 = !DIFile(filename: "foo", directory: "")
+!3 = !{}
+!4 = distinct !DISubprogram(name: "fn2", file: !2, line: 277, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !1, templateParams: !3, retainedNodes: !3)
+!5 = !DISubroutineType(types: !3)
|
amy-kwan
approved these changes
Feb 3, 2026
Member
amy-kwan
left a comment
There was a problem hiding this comment.
Thanks for fixing this, appreciate it! LGTM.
Contributor
Author
|
/cherry-pick 90c632a |
Member
|
/pull-request #179631 |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/31319 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/169/builds/19612 Here is the relevant piece of the build log for the reference |
rishabhmadan19
pushed a commit
to rishabhmadan19/llvm-project
that referenced
this pull request
Feb 9, 2026
We were setting it every time when switching to the section. This caused problems when the debug_aranges emission performed a switch at the end of the section, resulting in symbols incorrectly pointing to the end instead of the start of the function.
nikic
added a commit
to rust-lang/llvm-project
that referenced
this pull request
Feb 10, 2026
We were setting it every time when switching to the section. This caused problems when the debug_aranges emission performed a switch at the end of the section, resulting in symbols incorrectly pointing to the end instead of the start of the function. (cherry picked from commit 90c632a)
c-rhodes
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Feb 20, 2026
We were setting it every time when switching to the section. This caused problems when the debug_aranges emission performed a switch at the end of the section, resulting in symbols incorrectly pointing to the end instead of the start of the function. (cherry picked from commit 90c632a)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
We were setting it every time when switching to the section. This caused problems when the debug_aranges emission performed a switch at the end of the section, resulting in symbols incorrectly pointing to the end instead of the start of the function.