bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove assume_init in stack_overflow

Browse source 
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
This commit is contained in:
xizheyin 2025-02-19 13:20:03 +08:00
parent c1ecdf1124
commit 604364fcf4
No known key found for this signature in database
GPG key ID: 0A0D90BE99CEDEAD
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
library/std/src/sys/pal/unix/stack_overflow.rs
View file

@ -319,26 +319,29 @@ mod imp {
))]
unsafe fn get_stack_start() -> Option<*mut libc::c_void> {
let mut ret = None;
let attr: mem::MaybeUninit<libc::pthread_attr_t> = if cfg!(target_os = "freebsd") {
let mut attr: mem::MaybeUninit<libc::pthread_attr_t> = if cfg!(target_os = "freebsd") {
let mut attr = mem::MaybeUninit::uninit();
assert_eq!(libc::pthread_attr_init((&raw mut attr) as *mut _), 0);
attr
} else {
mem::MaybeUninit::zeroed()
};
let mut attr = unsafe { attr.assume_init() };
#[cfg(target_os = "freebsd")]
let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr);
let e = libc::pthread_attr_get_np(libc::pthread_self(), attr.as_mut_ptr());
#[cfg(not(target_os = "freebsd"))]
let e = libc::pthread_getattr_np(libc::pthread_self(), &mut attr);
let e = libc::pthread_getattr_np(libc::pthread_self(), attr.as_mut_ptr());
if e == 0 {
let mut stackaddr = crate::ptr::null_mut();
let mut stacksize = 0;
assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr, &mut stacksize), 0);
assert_eq!(
libc::pthread_attr_getstack(attr.as_ptr(), &mut stackaddr, &mut stacksize),
0
);
ret = Some(stackaddr);
}
if e == 0 || cfg!(target_os = "freebsd") {
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0);
assert_eq!(libc::pthread_attr_destroy(attr.as_mut_ptr()), 0);
}
ret
}

1
library/std/src/sys/pal/unix/thread.rs
View file

@ -51,7 +51,6 @@ impl Thread {
let mut native: libc::pthread_t = mem::zeroed();
let mut attr: mem::MaybeUninit<libc::pthread_attr_t> = mem::MaybeUninit::uninit();
assert_eq!(libc::pthread_attr_init(attr.as_mut_ptr()), 0);
//let mut attr: libc::pthread_attr_t = unsafe { attr.assume_init() };
#[cfg(target_os = "espidf")]
if stack > 0 {