mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline and remove scoped_thread.

Browse Source 
It has a single call site, and removing it slightly improves the
confusing tangle of nested closures present at startup.
This commit is contained in:
Nicholas Nethercote 2022-10-07 11:57:25 +11:00
parent 2a62c92b25
commit 134e9d36ce
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/rustc_interface/src/util.rs
View File

@ -130,33 +130,27 @@ fn get_stack_size() -> Option<usize> {
env::var_os("RUST_MIN_STACK").is_none().then_some(STACK_SIZE)
}
/// Like a `thread::Builder::spawn` followed by a `join()`, but avoids the need
/// for `'static` bounds.
#[cfg(not(parallel_compiler))]
fn scoped_thread<F: FnOnce() -> R + Send, R: Send>(cfg: thread::Builder, f: F) -> R {
// SAFETY: join() is called immediately, so any closure captures are still
// alive.
match unsafe { cfg.spawn_unchecked(f) }.unwrap().join() {
Ok(v) => v,
Err(e) => panic::resume_unwind(e),
}
}
#[cfg(not(parallel_compiler))]
pub fn run_in_thread_pool_with_globals<F: FnOnce() -> R + Send, R: Send>(
edition: Edition,
_threads: usize,
f: F,
) -> R {
// The thread pool is a single thread in the non-parallel compiler.
let mut cfg = thread::Builder::new().name("rustc".to_string());
if let Some(size) = get_stack_size() {
cfg = cfg.stack_size(size);
}
let main_handler = move || rustc_span::create_session_globals_then(edition, f);
let f = move || rustc_span::create_session_globals_then(edition, f);
scoped_thread(cfg, main_handler)
// This avoids the need for `'static` bounds.
//
// SAFETY: join() is called immediately, so any closure captures are still alive.
match unsafe { cfg.spawn_unchecked(f) }.unwrap().join() {
Ok(v) => v,
Err(e) => panic::resume_unwind(e),
}
}
/// Creates a new thread and forwards information in thread locals to it.