[SystemZ] Fix a bug introduced by #135767 #138280
Merged
Conversation
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
|
@llvm/pr-subscribers-backend-systemz Author: Dominik Steenken (dominik-steenken) ChangesCommit This commit fixes this by explicitly labeling Full diff: https://github.com/llvm/llvm-project/pull/138280.diff 1 Files Affected:
diff --git a/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp b/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
index 5b6b8773e6c58..d24a94ab25ff3 100644
--- a/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
@@ -13,6 +13,7 @@
#include "SystemZRegisterInfo.h"
#include "SystemZSubtarget.h"
#include "llvm/CodeGen/LivePhysRegs.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
#include "llvm/CodeGen/MachineModuleInfo.h"
#include "llvm/CodeGen/MachineRegisterInfo.h"
#include "llvm/CodeGen/RegisterScavenging.h"
@@ -584,7 +585,7 @@ void SystemZELFFrameLowering::emitPrologue(MachineFunction &MF,
// Reload return address from 8 bytes above stack pointer.
BuildMI(MBB, MBBI, DL, ZII->get(SystemZ::LG))
- .addReg(SystemZ::R14D)
+ .addReg(SystemZ::R14D, RegState::Define)
.addReg(SystemZ::R15D)
.addImm(8)
.addReg(0);
|
|
Can you also add the |
Commit `083b4a3d66` introduced a store-and-load pair around the `BRASL` call to mcount. That load instruction did not properly declare its target register as defined, leading to a bad machine instruction. This commit fixes this by explicitly labeling `%r14` on the load as `def`.
dominik-steenken
force-pushed
the
fix-135767
branch
from
1439f8f to
7f076a8
Compare
Done |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/66/builds/13405 Here is the relevant piece of the build log for the reference |
|
Will look into it shortly |
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.
Commit
083b4a3d66introduced a store-and-load pair around theBRASLcall to mcount. That load instruction did not properly declare its target register as defined, leading to a bad machine instruction.This commit fixes this by explicitly labeling
%r14on the load asdef.