assert alignment of thread_local statics

Author: folkertdev

src/tools/miri/tests/pass/static_align.rs

@@ -28,11 +28,16 @@ thread_local! {
     static HASDROP_CONST_LOCAL: HasDrop = const { HasDrop };
 }
 
+fn thread_local_addr<T>(key: &'static std::thread::LocalKey<T>) -> usize {
+    key.with(|local| core::ptr::from_ref::<T>(local).addr())
+}
+
 fn main() {
     assert!(core::ptr::from_ref(&FOO).addr().is_multiple_of(256));
     assert!(core::ptr::from_ref(&BAR).addr().is_multiple_of(512));
-    LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(512));
-    CONST_LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(512));
-    HASDROP_LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(512));
-    HASDROP_CONST_LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(512));
+
+    assert!(thread_local_addr(&LOCAL).is_multiple_of(4096));
+    assert!(thread_local_addr(&CONST_LOCAL).is_multiple_of(4096));
+    assert!(thread_local_addr(&HASDROP_LOCAL).is_multiple_of(4096));
+    assert!(thread_local_addr(&HASDROP_CONST_LOCAL).is_multiple_of(4096));
 }

tests/ui/static/static-align.rs

@@ -37,15 +37,19 @@ thread_local! {
     static HASDROP_CONST_LOCAL: HasDrop = const { HasDrop };
 }
 
+fn thread_local_addr<T>(key: &'static std::thread::LocalKey<T>) -> usize {
+    key.with(|local| core::ptr::from_ref::<T>(local).addr())
+}
+
 fn main() {
     assert!(core::ptr::from_ref(&A).addr().is_multiple_of(64));
     assert!(core::ptr::from_ref(&B).addr().is_multiple_of(4096));
 
     assert!(core::ptr::from_ref(&EXPORTED).addr().is_multiple_of(128));
     unsafe { assert!(core::ptr::from_ref(&C).addr().is_multiple_of(128)) };
 
-    LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(4096));
-    CONST_LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(4096));
-    HASDROP_LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(4096));
-    HASDROP_CONST_LOCAL.with(|local| core::ptr::from_ref(&local).addr().is_multiple_of(4096));
+    assert!(thread_local_addr(&LOCAL).is_multiple_of(4096));
+    assert!(thread_local_addr(&CONST_LOCAL).is_multiple_of(4096));
+    assert!(thread_local_addr(&HASDROP_LOCAL).is_multiple_of(4096));
+    assert!(thread_local_addr(&HASDROP_CONST_LOCAL).is_multiple_of(4096));
 }