Skip to content

Commit 9f50fa7

Browse files
committed
Ensure user trap code 0 is never used
Cranelift will return None from TrapCode::user(0). Fixes #1548
1 parent 67c241e commit 9f50fa7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/inline_asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub(crate) fn codegen_inline_asm_terminator<'tcx>(
136136
fx.bcx.ins().jump(destination_block, &[]);
137137
}
138138
None => {
139-
fx.bcx.ins().trap(TrapCode::user(0 /* unreachable */).unwrap());
139+
fx.bcx.ins().trap(TrapCode::user(1 /* unreachable */).unwrap());
140140
}
141141
}
142142
}

src/intrinsics/simd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
11361136
_ => {
11371137
fx.tcx.dcx().span_err(span, format!("Unknown SIMD intrinsic {}", intrinsic));
11381138
// Prevent verifier error
1139-
fx.bcx.ins().trap(TrapCode::user(0 /* unreachable */).unwrap());
1139+
fx.bcx.ins().trap(TrapCode::user(1 /* unreachable */).unwrap());
11401140
return;
11411141
}
11421142
}

0 commit comments

Comments
 (0)