From af9842428587d1bf05a8a432411b0ade0d5b2c8e Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 14 Oct 2024 21:36:37 +0200
Subject: [PATCH] add test ensuring a moved mutex deadlocks

---
 .../fail/concurrency/mutex-leak-move-deadlock.rs | 16 ++++++++++++++++
 .../concurrency/mutex-leak-move-deadlock.stderr  | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.rs
 create mode 100644 src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.stderr

diff --git a/src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.rs b/src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.rs
new file mode 100644
index 00000000000..b996fcaf45d
--- /dev/null
+++ b/src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.rs
@@ -0,0 +1,16 @@
+//@error-in-other-file: deadlock
+//@normalize-stderr-test: "src/sys/.*\.rs" -> "$$FILE"
+//@normalize-stderr-test: "LL \| .*" -> "LL | $$CODE"
+//@normalize-stderr-test: "\| +\^+" -> "| ^"
+//@normalize-stderr-test: "\n *= note:.*" -> ""
+use std::mem;
+use std::sync::Mutex;
+
+fn main() {
+    let m = Mutex::new(0);
+    mem::forget(m.lock());
+    // Move the lock while it is "held" (really: leaked)
+    let m2 = m;
+    // Now try to acquire the lock again.
+    let _guard = m2.lock();
+}
diff --git a/src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.stderr b/src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.stderr
new file mode 100644
index 00000000000..0ca8b3558d4
--- /dev/null
+++ b/src/tools/miri/tests/fail/concurrency/mutex-leak-move-deadlock.stderr
@@ -0,0 +1,16 @@
+error: deadlock: the evaluated program deadlocked
+  --> RUSTLIB/std/$FILE:LL:CC
+   |
+LL | $CODE
+   | ^ the evaluated program deadlocked
+   |
+note: inside `main`
+  --> tests/fail/concurrency/mutex-leak-move-deadlock.rs:LL:CC
+   |
+LL | $CODE
+   | ^
+
+note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
+
+error: aborting due to 1 previous error
+