Skip to content

Commit 2431a97

Browse files
committed
Auto merge of #96138 - erikdesjardins:revertinl, r=Mark-Simulacrum
[beta] Revert: Make TLS __getit #[inline(always)] on non-Windows Fixes #96132 r? `@Mark-Simulacrum`
2 parents 7c13df8 + 6a8a8f5 commit 2431a97

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
unsafe fn __getit(
183183
_init: $crate::option::Option<&mut $crate::option::Option<$t>>,
184184
) -> $crate::option::Option<&'static $t> {
@@ -311,7 +311,7 @@ macro_rules! __thread_local_inner {
311311
// gets the pessimistic path for now where it's never inlined.
312312
//
313313
// The issue of "should enable on Windows sometimes" is #84933
314-
#[cfg_attr(not(windows), inline(always))]
314+
#[cfg_attr(not(windows), inline)]
315315
unsafe fn __getit(
316316
init: $crate::option::Option<&mut $crate::option::Option<$t>>,
317317
) -> $crate::option::Option<&'static $t> {

0 commit comments

Comments
 (0)