Skip to content

Commit 73d1e08

Browse files
authored
Add some debug_asserts for unexpected conditions. (#136)
Add debug_asserts for the results of functions that aren't expected to fail in these contexts.
1 parent 94eb63b commit 73d1e08

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/arch/arm.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ pub(super) unsafe fn clone(
246246
#[cfg(feature = "thread")]
247247
#[inline]
248248
pub(super) unsafe fn set_thread_pointer(ptr: *mut c_void) {
249-
rustix::runtime::arm_set_tls(ptr).expect("arm_set_tls");
249+
let res = rustix::runtime::arm_set_tls(ptr);
250+
debug_assert_eq!(res, Ok(()));
250251
debug_assert_eq!(thread_pointer(), ptr);
251252
}
252253

src/arch/x86.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,10 @@ pub(super) unsafe fn set_thread_pointer(ptr: *mut c_void) {
322322
user_desc.set_limit_in_pages(1);
323323
user_desc.set_seg_not_present(0);
324324
user_desc.set_useable(1);
325-
rustix::runtime::set_thread_area(&mut user_desc).expect("set_thread_area");
325+
let res = rustix::runtime::set_thread_area(&mut user_desc);
326+
debug_assert_eq!(res, Ok(()));
327+
debug_assert_ne!(user_desc.entry_number, !0);
328+
326329
asm!("mov gs, {0:x}", in(reg) ((user_desc.entry_number << 3) | 3) as u16);
327330
debug_assert_eq!(*ptr.cast::<*const c_void>(), ptr);
328331
debug_assert_eq!(thread_pointer(), ptr);

0 commit comments

Comments
 (0)