Skip to content

Commit 1d57ac4

Browse files
committed
Remove hardcoded register number in common unwind code
1 parent 420e080 commit 1d57ac4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

unwind/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ impl<'a> FallibleIterator for StackFrames<'a> {
170170
newregs[DwarfRegister::IP] = None;
171171
for &(reg, ref rule) in row.registers() {
172172
trace!("rule {} {:?}", reg, rule);
173-
assert!(reg != 7); // stack = cfa
173+
assert!(reg != DwarfRegister::SP as u8); // stack = cfa
174174
newregs[reg] = match *rule {
175175
RegisterRule::Undefined => unreachable!(), // registers[reg],
176176
RegisterRule::SameValue => Some(registers[reg].unwrap()), // not sure why this exists
@@ -182,7 +182,7 @@ impl<'a> FallibleIterator for StackFrames<'a> {
182182
RegisterRule::Architectural => unreachable!(),
183183
};
184184
}
185-
newregs[7] = Some(cfa);
185+
newregs[DwarfRegister::SP] = Some(cfa);
186186

187187
*registers = newregs;
188188
trace!("registers:{:?}", registers);

0 commit comments

Comments
 (0)