[NVPTX] Fix DwarfFrameBase construction #101000
Merged
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
The `{0}` here was initializing the first union member `Register`,
rather than the union member used by CFA, which is `Location`.
Prior to llvm#99263 this was
harmless, but now they have different layout, leading to test
failures on some platforms.
|
@llvm/pr-subscribers-backend-nvptx Author: Nikita Popov (nikic) ChangesThe Full diff: https://github.com/llvm/llvm-project/pull/101000.diff 1 Files Affected:
diff --git a/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp b/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp
index 10ae81e0460e3..9abe0e3186f20 100644
--- a/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp
@@ -93,5 +93,8 @@ MachineBasicBlock::iterator NVPTXFrameLowering::eliminateCallFramePseudoInstr(
TargetFrameLowering::DwarfFrameBase
NVPTXFrameLowering::getDwarfFrameBase(const MachineFunction &MF) const {
- return {DwarfFrameBase::CFA, {0}};
+ DwarfFrameBase FrameBase;
+ FrameBase.Kind = DwarfFrameBase::CFA;
+ FrameBase.Location.Offset = 0;
+ return FrameBase;
}
|
|
I can't test on 32-bit ARM, but it should fix them there as well, yes. |
MaskRay
approved these changes
Jul 29, 2024
|
Thanks for the fix @nikic |
|
/cherry-pick 842a332 |
llvmbot
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 30, 2024
The `{0}` here was initializing the first union member `Register`,
rather than the union member used by CFA, which is `Offset`. Prior to
llvm#99263 this was harmless, but
now they have different layout, leading to test failures on some
platforms (at least i686 and s390x).
(cherry picked from commit 842a332)
|
/pull-request #101145 |
tru
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Jul 30, 2024
The `{0}` here was initializing the first union member `Register`,
rather than the union member used by CFA, which is `Offset`. Prior to
llvm#99263 this was harmless, but
now they have different layout, leading to test failures on some
platforms (at least i686 and s390x).
(cherry picked from commit 842a332)
banach-space
pushed a commit
to banach-space/llvm-project
that referenced
this pull request
Aug 7, 2024
The `{0}` here was initializing the first union member `Register`,
rather than the union member used by CFA, which is `Offset`. Prior to
llvm#99263 this was harmless, but
now they have different layout, leading to test failures on some
platforms (at least i686 and s390x).
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.
The
{0}here was initializing the first union memberRegister, rather than the union member used by CFA, which isOffset. Prior to #99263 this was harmless, but now they have different layout, leading to test failures on some platforms (at least i686 and s390x).