Commita272844

committed

Don't perform mitigation for thread-unsafe libc::exit under Miri.

1. Miri's exit is thread-safe2. Miri doesn't (yet) support `libc::gettid`, used in the implementation of the mitigation on Linux.

1 parent5035a17 commita272844Copy full SHA for a272844

File tree

-1

lines changed

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,13 @@`
`1`	`1`	`cfg_if::cfg_if!{`
`2`		`-if #[cfg(target_os ="linux")]{`
	`2`	`+if #[cfg(miri)]{`
	`3`	`+/// Mitigation for <https://github.com/rust-lang/rust/issues/126600>`
	`4`	`+///`
	`5`	`+/// This mitigation is not necessary when running under Miri, so this function does nothing`
	`6`	`+/// when running under Miri.`
	`7`	`+pub(crate)fn unique_thread_exit(){`
	`8`	+// Mitigation not required on Miri, where `exit` is thread-safe.
	`9`	`+}`
	`10`	`+} elseif #[cfg(target_os ="linux")]{`
`3`	`11`	`/// Mitigation for <https://github.com/rust-lang/rust/issues/126600>`
`4`	`12`	`///`
`5`	`13`	/// On `unix` (where `libc::exit` may not be thread-safe), ensure that only one Rust thread

Comments

(0)