squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Revert "Auto merge of #94373 - erikdesjardins:getitinl, r=Mark-Simulacrum"

Browse source 
This reverts commit 035a717ee8, reversing
changes made to 761e888485.
This commit is contained in:
Erik Desjardins 2022-04-17 02:15:45 -04:00
parent 43a71dc732
commit b0d9c42c46
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/std/src/thread/local.rs
View file

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