diff options
author | Christiaan Dirkx <christiaan@dirkx.email> | 2021-04-29 16:05:10 +0200 |
---|---|---|
committer | Christiaan Dirkx <christiaan@dirkx.email> | 2021-05-19 15:01:52 +0200 |
commit | 236705f3c30905623f97dc8887c83db520eb27c1 (patch) | |
tree | 3401d07479d3ee044418fc8178717412d3060957 /library/std/src/sys/unix/stack_overflow.rs | |
parent | b987f74f05b3fbeb81eed27c43678dc71cdab8cf (diff) | |
download | rust-236705f3c30905623f97dc8887c83db520eb27c1.tar.gz |
Replace `sys_common::util::report_overflow` with `rterr!`
Diffstat (limited to 'library/std/src/sys/unix/stack_overflow.rs')
-rw-r--r-- | library/std/src/sys/unix/stack_overflow.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/library/std/src/sys/unix/stack_overflow.rs b/library/std/src/sys/unix/stack_overflow.rs index 2a487fff54a..72fd48278bc 100644 --- a/library/std/src/sys/unix/stack_overflow.rs +++ b/library/std/src/sys/unix/stack_overflow.rs @@ -42,6 +42,7 @@ mod imp { use crate::io; use crate::mem; use crate::ptr; + use crate::thread; use libc::MAP_FAILED; use libc::{mmap, munmap}; @@ -95,15 +96,16 @@ mod imp { info: *mut libc::siginfo_t, _data: *mut libc::c_void, ) { - use crate::sys_common::util::report_overflow; - let guard = thread_info::stack_guard().unwrap_or(0..0); let addr = siginfo_si_addr(info); // If the faulting address is within the guard page, then we print a // message saying so and abort. if guard.start <= addr && addr < guard.end { - report_overflow(); + rterr!( + "\nthread '{}' has overflowed its stack\n", + thread::current().name().unwrap_or("<unknown>") + ); rtabort!("stack overflow"); } else { // Unregister ourselves by reverting back to the default behavior. |