Skip to content

Commit ec77f25

Browse files
committed
Auto merge of #96139 - erikdesjardins:revertinl2, r=Mark-Simulacrum
Revert: Make TLS __getit #[inline(always)] on non-Windows re #96132 r? `@Mark-Simulacrum`
2 parents ad4e98e + b0d9c42 commit ec77f25

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

library/std/src/thread/local.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ macro_rules! thread_local {
178178
macro_rules! __thread_local_inner {
179179
// used to generate the `LocalKey` value for const-initialized thread locals
180180
(@key $t:ty, const $init:expr) => {{
181-
#[cfg_attr(not(windows), inline(always))] // see comments below
181+
#[cfg_attr(not(windows), inline)] // see comments below
182182
#[deny(unsafe_op_in_unsafe_fn)]
183183
unsafe fn __getit(
184184
_init: $crate::option::Option<&mut $crate::option::Option<$t>>,
@@ -312,7 +312,7 @@ macro_rules! __thread_local_inner {
312312
// gets the pessimistic path for now where it's never inlined.
313313
//
314314
// The issue of "should enable on Windows sometimes" is #84933
315-
#[cfg_attr(not(windows), inline(always))]
315+
#[cfg_attr(not(windows), inline)]
316316
unsafe fn __getit(
317317
init: $crate::option::Option<&mut $crate::option::Option<$t>>,
318318
) -> $crate::option::Option<&'static $t> {

0 commit comments

Comments
 (0)