about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorChris Denton <chris@chrisdenton.dev>2025-04-21 15:55:57 +0000
committerGitHub <noreply@github.com>2025-04-21 15:55:57 +0000
commit24bd5649b1d7fd3c0467703f249ac05fb0991567 (patch)
treea3915305e96a0d694a368cc44e43f2f98250689b /tests
parent10e17dc3a4e9fac243e9ebbcfa8d344ac951c289 (diff)
parent17b7d63fd787699dac3fffbf9930dc799291a5f2 (diff)
downloadrust-24bd5649b1d7fd3c0467703f249ac05fb0991567.tar.gz
rust-24bd5649b1d7fd3c0467703f249ac05fb0991567.zip
Rollup merge of #140009 - ShE3py:tls-abort, r=thomcc
docs(LocalKey<T>): clarify that T's Drop shouldn't panic

Clarify that should a TLS destructor panics, the process will abort.

Also, an abort may be obfuscated as the process can be terminated with `SIGSEGV` or [`STATUS_STACK_BUFFER_OVERRUN`](https://devblogs.microsoft.com/oldnewthing/20190108-00/?p=100655) (i.e., `SIGABRT` is not guaranteed), so explicitly prints that the process was aborted.

Context:
https://users.rust-lang.org/t/status-stack-buffer-overrun-on-windows-without-any-usage-of-unsafe/128417

``@rustbot`` label -T-compiler
Diffstat (limited to 'tests')
-rw-r--r--tests/ui/runtime/rt-explody-panic-payloads.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/runtime/rt-explody-panic-payloads.rs b/tests/ui/runtime/rt-explody-panic-payloads.rs
index c177fd260ed..d564a26ca73 100644
--- a/tests/ui/runtime/rt-explody-panic-payloads.rs
+++ b/tests/ui/runtime/rt-explody-panic-payloads.rs
@@ -27,6 +27,6 @@ fn main() {
             // by QEMU in the stderr whenever a core dump happens. Remove it before the check.
             v.strip_suffix("qemu: uncaught target signal 6 (Aborted) - core dumped\n").unwrap_or(v)
         })
-        .map(|v| { v.ends_with("fatal runtime error: drop of the panic payload panicked\n") })
+        .map(|v| v.ends_with("fatal runtime error: drop of the panic payload panicked, aborting\n"))
         .unwrap_or(false));
 }