test both kinds of TLS

Author: max-heller

tests/fail/leak_in_tls.rs

@@ -1,20 +1,25 @@
 //@error-in-other-file: memory leaked
+//@error-in-other-file: memory leaked
 //@normalize-stderr-test: ".*│.*" -> "$$stripped$$"
 
+#![feature(thread_local)]
+
 use std::cell::Cell;
 
 pub fn main() {
     thread_local! {
-        static REF: Cell<Option<&'static i32>> = Cell::new(None);
+        static TLS_KEY: Cell<Option<&'static i32>> = Cell::new(None);
     }
 
+    #[thread_local]
+    static TLS: Cell<Option<&'static i32>> = Cell::new(None);
+
     std::thread::spawn(|| {
-        REF.with(|cell| {
-            let a = 123;
-            let b = Box::new(a);
-            let r = Box::leak(b);
-            cell.set(Some(r));
-        })
+        TLS_KEY.with(|cell| {
+            cell.set(Some(Box::leak(Box::new(123))));
+        });
+
+        TLS.set(Some(Box::leak(Box::new(123))));
     })
     .join()
     .unwrap();

tests/fail/leak_in_tls.stderr

@@ -12,24 +12,38 @@ LL |         __rust_alloc(layout.size(), layout.align())
 note: inside closure
   --> $DIR/leak_in_tls.rs:LL:CC
    |
-LL |             let b = Box::new(a);
-   |                     ^^^^^^^^^^^
+LL |             cell.set(Some(Box::leak(Box::new(123))));
+   |                                     ^^^^^^^^^^^^^
    = note: inside `std::thread::LocalKey::<std::cell::Cell<std::option::Option<&i32>>>::try_with::<[closure@$DIR/leak_in_tls.rs:LL:CC], ()>` at RUSTLIB/std/src/thread/local.rs:LL:CC
    = note: inside `std::thread::LocalKey::<std::cell::Cell<std::option::Option<&i32>>>::with::<[closure@$DIR/leak_in_tls.rs:LL:CC], ()>` at RUSTLIB/std/src/thread/local.rs:LL:CC
 note: inside closure
   --> $DIR/leak_in_tls.rs:LL:CC
    |
-LL | /         REF.with(|cell| {
-LL | |             let a = 123;
-LL | |             let b = Box::new(a);
-LL | |             let r = Box::leak(b);
-LL | |             cell.set(Some(r));
-LL | |         })
+LL | /         TLS_KEY.with(|cell| {
+LL | |             cell.set(Some(Box::leak(Box::new(123))));
+LL | |         });
    | |__________^
 
+error: memory leaked: ALLOC (Rust heap, size: 4, align: 4), allocated here:
+  --> RUSTLIB/alloc/src/alloc.rs:LL:CC
+   |
+LL |         __rust_alloc(layout.size(), layout.align())
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: inside `std::alloc::alloc` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `std::alloc::Global::alloc_impl` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `<std::alloc::Global as std::alloc::Allocator>::allocate` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `alloc::alloc::exchange_malloc` at RUSTLIB/alloc/src/alloc.rs:LL:CC
+   = note: inside `std::boxed::Box::<i32>::new` at RUSTLIB/alloc/src/boxed.rs:LL:CC
+note: inside closure
+  --> $DIR/leak_in_tls.rs:LL:CC
+   |
+LL |         TLS.set(Some(Box::leak(Box::new(123))));
+   |                                ^^^^^^^^^^^^^
+
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
 note: the evaluated program leaked memory, pass `-Zmiri-ignore-leaks` to disable this check
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 

tests/pass/issues/issue-miri-2881.rs

@@ -1,15 +1,18 @@
+#![feature(thread_local)]
+
 use std::cell::Cell;
 
 pub fn main() {
-    let a = 123;
-    let b = Box::new(a);
-    let r = Box::leak(b);
-
     thread_local! {
-        static REF: Cell<Option<&'static i32>> = Cell::new(None);
+        static TLS_KEY: Cell<Option<&'static i32>> = Cell::new(None);
     }
 
-    REF.with(|cell| {
-        cell.set(Some(r));
-    })
+    TLS_KEY.with(|cell| {
+        cell.set(Some(Box::leak(Box::new(123))));
+    });
+
+    #[thread_local]
+    static TLS: Cell<Option<&'static i32>> = Cell::new(None);
+
+    TLS.set(Some(Box::leak(Box::new(123))));
 }