mirror of https://github.com/rust-lang/rust.git
Rollup merge of #127789 - Sword-Destiny:master, r=petrochenkov
delete #![allow(unsafe_op_in_unsafe_fn)] in teeos deny unsafe_op_in_unsafe_fn for teeos
This commit is contained in:
commit
08809eb746
|
@ -11,9 +11,9 @@ unsafe impl GlobalAlloc for System {
|
|||
// Also see <https://github.com/rust-lang/rust/issues/45955> and
|
||||
// <https://github.com/rust-lang/rust/issues/62251#issuecomment-507580914>.
|
||||
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
|
||||
libc::malloc(layout.size()) as *mut u8
|
||||
unsafe { libc::malloc(layout.size()) as *mut u8 }
|
||||
} else {
|
||||
aligned_malloc(&layout)
|
||||
unsafe { aligned_malloc(&layout) }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,11 +21,11 @@ unsafe impl GlobalAlloc for System {
|
|||
unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
|
||||
// See the comment above in `alloc` for why this check looks the way it does.
|
||||
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
|
||||
libc::calloc(layout.size(), 1) as *mut u8
|
||||
unsafe { libc::calloc(layout.size(), 1) as *mut u8 }
|
||||
} else {
|
||||
let ptr = self.alloc(layout);
|
||||
let ptr = unsafe { self.alloc(layout) };
|
||||
if !ptr.is_null() {
|
||||
ptr::write_bytes(ptr, 0, layout.size());
|
||||
unsafe { ptr::write_bytes(ptr, 0, layout.size()) };
|
||||
}
|
||||
ptr
|
||||
}
|
||||
|
@ -33,15 +33,15 @@ unsafe impl GlobalAlloc for System {
|
|||
|
||||
#[inline]
|
||||
unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
|
||||
libc::free(ptr as *mut libc::c_void)
|
||||
unsafe { libc::free(ptr as *mut libc::c_void) }
|
||||
}
|
||||
|
||||
#[inline]
|
||||
unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
|
||||
if layout.align() <= MIN_ALIGN && layout.align() <= new_size {
|
||||
libc::realloc(ptr as *mut libc::c_void, new_size) as *mut u8
|
||||
unsafe { libc::realloc(ptr as *mut libc::c_void, new_size) as *mut u8 }
|
||||
} else {
|
||||
realloc_fallback(self, ptr, layout, new_size)
|
||||
unsafe { realloc_fallback(self, ptr, layout, new_size) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -52,6 +52,6 @@ unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
|
|||
// posix_memalign requires that the alignment be a multiple of `sizeof(void*)`.
|
||||
// Since these are all powers of 2, we can just use max.
|
||||
let align = layout.align().max(crate::mem::size_of::<usize>());
|
||||
let ret = libc::posix_memalign(&mut out, align, layout.size());
|
||||
let ret = unsafe { libc::posix_memalign(&mut out, align, layout.size()) };
|
||||
if ret != 0 { ptr::null_mut() } else { out as *mut u8 }
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
//!
|
||||
//! This module contains the facade (aka platform-specific) implementations of
|
||||
//! OS level functionality for Teeos.
|
||||
#![allow(unsafe_op_in_unsafe_fn)]
|
||||
#![deny(unsafe_op_in_unsafe_fn)]
|
||||
#![allow(unused_variables)]
|
||||
#![allow(dead_code)]
|
||||
|
||||
|
|
|
@ -28,22 +28,24 @@ impl Thread {
|
|||
// unsafe: see thread::Builder::spawn_unchecked for safety requirements
|
||||
pub unsafe fn new(stack: usize, p: Box<dyn FnOnce()>) -> io::Result<Thread> {
|
||||
let p = Box::into_raw(Box::new(p));
|
||||
let mut native: libc::pthread_t = mem::zeroed();
|
||||
let mut attr: libc::pthread_attr_t = mem::zeroed();
|
||||
assert_eq!(libc::pthread_attr_init(&mut attr), 0);
|
||||
let mut native: libc::pthread_t = unsafe { mem::zeroed() };
|
||||
let mut attr: libc::pthread_attr_t = unsafe { mem::zeroed() };
|
||||
assert_eq!(unsafe { libc::pthread_attr_init(&mut attr) }, 0);
|
||||
assert_eq!(
|
||||
libc::pthread_attr_settee(
|
||||
&mut attr,
|
||||
libc::TEESMP_THREAD_ATTR_CA_INHERIT,
|
||||
libc::TEESMP_THREAD_ATTR_TASK_ID_INHERIT,
|
||||
libc::TEESMP_THREAD_ATTR_HAS_SHADOW,
|
||||
),
|
||||
unsafe {
|
||||
libc::pthread_attr_settee(
|
||||
&mut attr,
|
||||
libc::TEESMP_THREAD_ATTR_CA_INHERIT,
|
||||
libc::TEESMP_THREAD_ATTR_TASK_ID_INHERIT,
|
||||
libc::TEESMP_THREAD_ATTR_HAS_SHADOW,
|
||||
)
|
||||
},
|
||||
0,
|
||||
);
|
||||
|
||||
let stack_size = cmp::max(stack, min_stack_size(&attr));
|
||||
|
||||
match libc::pthread_attr_setstacksize(&mut attr, stack_size) {
|
||||
match unsafe { libc::pthread_attr_setstacksize(&mut attr, stack_size) } {
|
||||
0 => {}
|
||||
n => {
|
||||
assert_eq!(n, libc::EINVAL);
|
||||
|
@ -54,7 +56,7 @@ impl Thread {
|
|||
let page_size = os::page_size();
|
||||
let stack_size =
|
||||
(stack_size + page_size - 1) & (-(page_size as isize - 1) as usize - 1);
|
||||
assert_eq!(libc::pthread_attr_setstacksize(&mut attr, stack_size), 0);
|
||||
assert_eq!(unsafe { libc::pthread_attr_setstacksize(&mut attr, stack_size) }, 0);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -62,12 +64,12 @@ impl Thread {
|
|||
// Note: if the thread creation fails and this assert fails, then p will
|
||||
// be leaked. However, an alternative design could cause double-free
|
||||
// which is clearly worse.
|
||||
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0);
|
||||
assert_eq!(unsafe { libc::pthread_attr_destroy(&mut attr) }, 0);
|
||||
|
||||
return if ret != 0 {
|
||||
// The thread failed to start and as a result p was not consumed. Therefore, it is
|
||||
// safe to reconstruct the box so that it gets deallocated.
|
||||
drop(Box::from_raw(p));
|
||||
drop(unsafe { Box::from_raw(p) });
|
||||
Err(io::Error::from_raw_os_error(ret))
|
||||
} else {
|
||||
// The new thread will start running earliest after the next yield.
|
||||
|
|
|
@ -76,16 +76,16 @@ impl Condvar {
|
|||
|
||||
#[inline]
|
||||
pub unsafe fn wait(&self, mutex: &Mutex) {
|
||||
let mutex = mutex::raw(mutex);
|
||||
let mutex = unsafe { mutex::raw(mutex) };
|
||||
self.verify(mutex);
|
||||
let r = libc::pthread_cond_wait(raw(self), mutex);
|
||||
let r = unsafe { libc::pthread_cond_wait(raw(self), mutex) };
|
||||
debug_assert_eq!(r, 0);
|
||||
}
|
||||
|
||||
pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
|
||||
use crate::sys::time::Timespec;
|
||||
|
||||
let mutex = mutex::raw(mutex);
|
||||
let mutex = unsafe { mutex::raw(mutex) };
|
||||
self.verify(mutex);
|
||||
|
||||
let timeout = Timespec::now(libc::CLOCK_MONOTONIC)
|
||||
|
@ -93,7 +93,7 @@ impl Condvar {
|
|||
.and_then(|t| t.to_timespec())
|
||||
.unwrap_or(TIMESPEC_MAX);
|
||||
|
||||
let r = pthread_cond_timedwait(raw(self), mutex, &timeout);
|
||||
let r = unsafe { pthread_cond_timedwait(raw(self), mutex, &timeout) };
|
||||
assert!(r == libc::ETIMEDOUT || r == 0);
|
||||
r == 0
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue