From 2d6d30f4a86682f351149d9ad24a6a132c026362 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Fri, 25 Feb 2022 15:21:27 -0500 Subject: [PATCH] Make TLS __getit #[inline(always)] on non-Windows This may improve perf. --- library/std/src/thread/local.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/std/src/thread/local.rs b/library/std/src/thread/local.rs index 1be3ed757ba29..2464a0e2e473c 100644 --- a/library/std/src/thread/local.rs +++ b/library/std/src/thread/local.rs @@ -177,7 +177,7 @@ macro_rules! thread_local { macro_rules! __thread_local_inner { // used to generate the `LocalKey` value for const-initialized thread locals (@key $t:ty, const $init:expr) => {{ - #[cfg_attr(not(windows), inline)] // see comments below + #[cfg_attr(not(windows), inline(always))] // see comments below unsafe fn __getit() -> $crate::option::Option<&'static $t> { const INIT_EXPR: $t = $init; @@ -297,7 +297,7 @@ macro_rules! __thread_local_inner { // gets the pessimistic path for now where it's never inlined. // // The issue of "should enable on Windows sometimes" is #84933 - #[cfg_attr(not(windows), inline)] + #[cfg_attr(not(windows), inline(always))] unsafe fn __getit() -> $crate::option::Option<&'static $t> { #[cfg(all(target_family = "wasm", not(target_feature = "atomics")))] static __KEY: $crate::thread::__StaticLocalKeyInner<$t> =