nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #123826 - kornelski:one-in-a-quintillion, r=Amanieu

Browse Source 
Move rare overflow error to a cold function

`scoped.spawn()` generates unnecessary inlined panic-formatting code for a branch that will never be taken.
This commit is contained in:
Matthias Krüger 2024-04-12 04:38:22 +02:00 committed by GitHub
commit 3758e2ffa5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/std/src/thread/scoped.rs
View File

@ -47,10 +47,16 @@ impl ScopeData {
// chance it overflows to 0, which would result in unsoundness. // chance it overflows to 0, which would result in unsoundness.
if self.num_running_threads.fetch_add(1, Ordering::Relaxed) > usize::MAX / 2 { if self.num_running_threads.fetch_add(1, Ordering::Relaxed) > usize::MAX / 2 {
// This can only reasonably happen by mem::forget()'ing a lot of ScopedJoinHandles. // This can only reasonably happen by mem::forget()'ing a lot of ScopedJoinHandles.
self.decrement_num_running_threads(false); self.overflow();
panic!("too many running threads in thread scope");
} }
} }
#[cold]
fn overflow(&self) {
self.decrement_num_running_threads(false);
panic!("too many running threads in thread scope");
}
pub(super) fn decrement_num_running_threads(&self, panic: bool) { pub(super) fn decrement_num_running_threads(&self, panic: bool) {
if panic { if panic {
self.a_thread_panicked.store(true, Ordering::Relaxed); self.a_thread_panicked.store(true, Ordering::Relaxed);