Skip to content

Commit d4c9064

Browse files
committed
Remove hardcoded register number in common unwind code
1 parent 51ae696 commit d4c9064

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
@@ -185,7 +185,7 @@ impl<'a> FallibleIterator for StackFrames<'a> {
185185
newregs[DwarfRegister::IP] = None;
186186
for &(reg, ref rule) in row.registers() {
187187
trace!("rule {} {:?}", reg, rule);
188-
assert!(reg != 7); // stack = cfa
188+
assert!(reg != DwarfRegister::SP as u8); // stack = cfa
189189
newregs[reg] = match *rule {
190190
RegisterRule::Undefined => unreachable!(), // registers[reg],
191191
RegisterRule::SameValue => Some(registers[reg].unwrap()), // not sure why this exists
@@ -197,7 +197,7 @@ impl<'a> FallibleIterator for StackFrames<'a> {
197197
RegisterRule::Architectural => unreachable!(),
198198
};
199199
}
200-
newregs[7] = Some(cfa);
200+
newregs[DwarfRegister::SP] = Some(cfa);
201201

202202
*registers = newregs;
203203
trace!("registers:{:?}", registers);

0 commit comments

Comments
 (0)