ScheduleDAG: Clear registers on DEBUG_VALUE_LIST correctly. #173133
+7
−1
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
Created using spr 1.3.6-beta.1
Member
|
@llvm/pr-subscribers-llvm-selectiondag Author: Peter Collingbourne (pcc) ChangesPreviously we were unconditionally setting operand 0 to a register which Exposed by #172962. No test because I'm not sure how to test this on Full diff: https://github.com/llvm/llvm-project/pull/173133.diff 1 Files Affected:
diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
index 4f4fb9c759ad7..c66549235a8a0 100644
--- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
@@ -1083,7 +1083,13 @@ EmitSchedule(MachineBasicBlock::iterator &InsertPos) {
// The DBG_VALUE was referencing a value produced by a terminator. By
// moving the DBG_VALUE, the referenced value also needs invalidating.
- MI.getOperand(0).ChangeToRegister(0, false);
+ if (MI.isDebugValueList()) {
+ for (auto &Op : MI.operands())
+ if (Op.isReg())
+ Op.ChangeToRegister(0, false);
+ } else {
+ MI.getOperand(0).ChangeToRegister(0, false);
+ }
MI.moveBefore(&*FirstTerm);
}
}
|
arsenm
reviewed
Dec 20, 2025
| if (MI.isDebugValueList()) { | ||
| for (auto &Op : MI.operands()) | ||
| if (Op.isReg()) | ||
| Op.ChangeToRegister(0, false); |
Contributor
There was a problem hiding this comment.
Suggested change
| Op.ChangeToRegister(0, false); | |
| Op.ChangeToRegister(Register(), false); |
| if (Op.isReg()) | ||
| Op.ChangeToRegister(0, false); | ||
| } else { | ||
| MI.getOperand(0).ChangeToRegister(0, false); |
Contributor
There was a problem hiding this comment.
Suggested change
| MI.getOperand(0).ChangeToRegister(0, false); | |
| MI.getOperand(0).ChangeToRegister(Register(), false); |
| // moving the DBG_VALUE, the referenced value also needs invalidating. | ||
| MI.getOperand(0).ChangeToRegister(0, false); | ||
| if (MI.isDebugValueList()) { | ||
| for (auto &Op : MI.operands()) |
Contributor
There was a problem hiding this comment.
Suggested change
| for (auto &Op : MI.operands()) | |
| for (MachineOperand &Op : MI.operands()) |
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.
Previously we were unconditionally setting operand 0 to a register which
is the metadata operand with DEBUG_VALUE_LIST, which led to assertion
failures. DEBUG_VALUE_LIST register operands start with operand 2,
so enumerate them and clear any that are already registers.
Exposed by #172962. No test because I'm not sure how to test this on
its own.