Skip to content

Commit ee86041

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#128089 - workingjubilee:commonly-wrapped-to-make-safe, r=ChrisDenton
std: Unsafe-wrap actually-universal platform code Every platform compiles the unsafe parts of this code, so just clean this up. Almost entirely a whitespace diff.
2 parents ad9a52d + de2a037 commit ee86041

File tree

2 files changed

+72
-65
lines changed

2 files changed

+72
-65
lines changed

‎std/src/sys/backtrace.rs‎

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//! Common code for printing backtraces.
2+
#![forbid(unsafe_op_in_unsafe_fn)]
23

34
use crate::backtrace_rs::{self, BacktraceFmt, BytesOrWideString, PrintFmt};
45
use crate::borrow::Cow;
@@ -62,73 +63,76 @@ unsafe fn _print_fmt(fmt: &mut fmt::Formatter<'_>, print_fmt: PrintFmt) -> fmt::
6263
// Start immediately if we're not using a short backtrace.
6364
let mut start = print_fmt != PrintFmt::Short;
6465
set_image_base();
65-
backtrace_rs::trace_unsynchronized(|frame| {
66-
if print_fmt == PrintFmt::Short && idx > MAX_NB_FRAMES {
67-
return false;
68-
}
66+
// SAFETY: we roll our own locking in this town
67+
unsafe {
68+
backtrace_rs::trace_unsynchronized(|frame| {
69+
if print_fmt == PrintFmt::Short && idx > MAX_NB_FRAMES {
70+
return false;
71+
}
6972

70-
let mut hit = false;
71-
backtrace_rs::resolve_frame_unsynchronized(frame, |symbol| {
72-
hit = true;
73-
74-
// Any frames between `__rust_begin_short_backtrace` and `__rust_end_short_backtrace`
75-
// are omitted from the backtrace in short mode, `__rust_end_short_backtrace` will be
76-
// called before the panic hook, so we won't ignore any frames if there is no
77-
// invoke of `__rust_begin_short_backtrace`.
78-
if print_fmt == PrintFmt::Short {
79-
if let Some(sym) = symbol.name().and_then(|s| s.as_str()) {
80-
if start && sym.contains("__rust_begin_short_backtrace") {
81-
start = false;
82-
return;
83-
}
84-
if sym.contains("__rust_end_short_backtrace") {
85-
start = true;
86-
return;
87-
}
88-
if !start {
89-
omitted_count += 1;
73+
let mut hit = false;
74+
backtrace_rs::resolve_frame_unsynchronized(frame, |symbol| {
75+
hit = true;
76+
77+
// Any frames between `__rust_begin_short_backtrace` and `__rust_end_short_backtrace`
78+
// are omitted from the backtrace in short mode, `__rust_end_short_backtrace` will be
79+
// called before the panic hook, so we won't ignore any frames if there is no
80+
// invoke of `__rust_begin_short_backtrace`.
81+
if print_fmt == PrintFmt::Short {
82+
if let Some(sym) = symbol.name().and_then(|s| s.as_str()) {
83+
if start && sym.contains("__rust_begin_short_backtrace") {
84+
start = false;
85+
return;
86+
}
87+
if sym.contains("__rust_end_short_backtrace") {
88+
start = true;
89+
return;
90+
}
91+
if !start {
92+
omitted_count += 1;
93+
}
9094
}
9195
}
92-
}
9396

94-
if start {
95-
if omitted_count > 0 {
96-
debug_assert!(print_fmt == PrintFmt::Short);
97-
// only print the message between the middle of frames
98-
if !first_omit {
99-
let _ = writeln!(
100-
bt_fmt.formatter(),
101-
" [... omitted {} frame{} ...]",
102-
omitted_count,
103-
if omitted_count > 1 { "s" } else { "" }
104-
);
97+
if start {
98+
if omitted_count > 0 {
99+
debug_assert!(print_fmt == PrintFmt::Short);
100+
// only print the message between the middle of frames
101+
if !first_omit {
102+
let _ = writeln!(
103+
bt_fmt.formatter(),
104+
" [... omitted {} frame{} ...]",
105+
omitted_count,
106+
if omitted_count > 1 { "s" } else { "" }
107+
);
108+
}
109+
first_omit = false;
110+
omitted_count = 0;
105111
}
106-
first_omit = false;
107-
omitted_count = 0;
112+
res = bt_fmt.frame().symbol(frame, symbol);
108113
}
109-
res = bt_fmt.frame().symbol(frame, symbol);
114+
});
115+
#[cfg(target_os = "nto")]
116+
if libc::__my_thread_exit as *mut libc::c_void == frame.ip() {
117+
if !hit && start {
118+
use crate::backtrace_rs::SymbolName;
119+
res = bt_fmt.frame().print_raw(
120+
frame.ip(),
121+
Some(SymbolName::new("__my_thread_exit".as_bytes())),
122+
None,
123+
None,
124+
);
125+
}
126+
return false;
110127
}
111-
});
112-
#[cfg(target_os = "nto")]
113-
if libc::__my_thread_exit as *mut libc::c_void == frame.ip() {
114128
if !hit && start {
115-
use crate::backtrace_rs::SymbolName;
116-
res = bt_fmt.frame().print_raw(
117-
frame.ip(),
118-
Some(SymbolName::new("__my_thread_exit".as_bytes())),
119-
None,
120-
None,
121-
);
129+
res = bt_fmt.frame().print_raw(frame.ip(), None, None, None);
122130
}
123-
return false;
124-
}
125-
if !hit && start {
126-
res = bt_fmt.frame().print_raw(frame.ip(), None, None, None);
127-
}
128131

129-
idx += 1;
130-
res.is_ok()
131-
});
132+
idx += 1;
133+
res.is_ok()
134+
})
135+
};
132136
res?;
133137
bt_fmt.finish()?;
134138
if print_fmt == PrintFmt::Short {

‎std/src/sys/pal/common/alloc.rs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![forbid(unsafe_op_in_unsafe_fn)]
12
use crate::alloc::{GlobalAlloc, Layout, System};
23
use crate::cmp;
34
use crate::ptr;
@@ -46,14 +47,16 @@ pub unsafe fn realloc_fallback(
4647
old_layout: Layout,
4748
new_size: usize,
4849
) -> *mut u8 {
49-
// Docs for GlobalAlloc::realloc require this to be valid:
50-
let new_layout = Layout::from_size_align_unchecked(new_size, old_layout.align());
50+
// SAFETY: Docs for GlobalAlloc::realloc require this to be valid
51+
unsafe {
52+
let new_layout = Layout::from_size_align_unchecked(new_size, old_layout.align());
5153

52-
let new_ptr = GlobalAlloc::alloc(alloc, new_layout);
53-
if !new_ptr.is_null() {
54-
let size = cmp::min(old_layout.size(), new_size);
55-
ptr::copy_nonoverlapping(ptr, new_ptr, size);
56-
GlobalAlloc::dealloc(alloc, ptr, old_layout);
54+
let new_ptr = GlobalAlloc::alloc(alloc, new_layout);
55+
if !new_ptr.is_null() {
56+
let size = cmp::min(old_layout.size(), new_size);
57+
ptr::copy_nonoverlapping(ptr, new_ptr, size);
58+
GlobalAlloc::dealloc(alloc, ptr, old_layout);
59+
}
60+
new_ptr
5761
}
58-
new_ptr
5962
}

0 commit comments

Comments
 (0)