From 224cb3f638881525c00c46b012721f0aafc73263 Mon Sep 17 00:00:00 2001 From: Rémy Rakic Date: Fri, 28 Jun 2024 20:59:01 +0000 Subject: Revert "Rollup merge of #126938 - RalfJung:link_section, r=compiler-errors" This reverts commit 5c4ede88c61e746ed5c852d7a7e38ab1a824ae52, reversing changes made to 95332b89187bb6a0c910574cfeff1933b619565a. --- src/tools/miri/tests/pass/tls/win_tls_callback.rs | 16 ---------------- src/tools/miri/tests/pass/tls/win_tls_callback.stderr | 1 - 2 files changed, 17 deletions(-) delete mode 100644 src/tools/miri/tests/pass/tls/win_tls_callback.rs delete mode 100644 src/tools/miri/tests/pass/tls/win_tls_callback.stderr (limited to 'src') diff --git a/src/tools/miri/tests/pass/tls/win_tls_callback.rs b/src/tools/miri/tests/pass/tls/win_tls_callback.rs deleted file mode 100644 index 99a8de29e91..00000000000 --- a/src/tools/miri/tests/pass/tls/win_tls_callback.rs +++ /dev/null @@ -1,16 +0,0 @@ -//! Ensure that we call Windows TLS callbacks in the local crate. -//@only-target-windows -// Calling eprintln in the callback seems to (re-)initialize some thread-local storage -// and then leak the memory allocated for that. Let's just ignore these leaks, -// that's not what this test is about. -//@compile-flags: -Zmiri-ignore-leaks - -#[link_section = ".CRT$XLB"] -#[used] // Miri only considers explicitly `#[used]` statics for `lookup_link_section` -pub static CALLBACK: unsafe extern "system" fn(*const (), u32, *const ()) = tls_callback; - -unsafe extern "system" fn tls_callback(_h: *const (), _dw_reason: u32, _pv: *const ()) { - eprintln!("in tls_callback"); -} - -fn main() {} diff --git a/src/tools/miri/tests/pass/tls/win_tls_callback.stderr b/src/tools/miri/tests/pass/tls/win_tls_callback.stderr deleted file mode 100644 index 84795589544..00000000000 --- a/src/tools/miri/tests/pass/tls/win_tls_callback.stderr +++ /dev/null @@ -1 +0,0 @@ -in tls_callback -- cgit 1.4.1-3-g733a5