Merge pull request #4748 from RalfJung/deadlock-empty-stack

RalfJung · web-flow · commit 673b3b186dce · 2025-12-06T15:28:20.000Z
fix empty stack in deadlock error message
diff --git a/src/tools/miri/src/concurrency/thread.rs b/src/tools/miri/src/concurrency/thread.rs
@@ -834,7 +834,7 @@ trait EvalContextPrivExt<'tcx>: MiriInterpCxExt<'tcx> {
             // sleep until the first callback.
             interp_ok(SchedulingAction::Sleep(sleep_time))
         } else {
-            throw_machine_stop!(TerminationInfo::Deadlock);
+            throw_machine_stop!(TerminationInfo::GlobalDeadlock);
         }
     }
 }
diff --git a/src/tools/miri/src/diagnostics.rs b/src/tools/miri/src/diagnostics.rs
@@ -32,7 +32,10 @@ pub enum TerminationInfo {
         history: tree_diagnostics::HistoryData,
     },
     Int2PtrWithStrictProvenance,
-    Deadlock,
+    /// All threads are blocked.
+    GlobalDeadlock,
+    /// Some thread discovered a deadlock condition (e.g. in a mutex with reentrancy checking).
+    LocalDeadlock,
     MultipleSymbolDefinitions {
         link_name: Symbol,
         first: SpanData,
@@ -76,7 +79,8 @@ impl fmt::Display for TerminationInfo {
                 ),
             StackedBorrowsUb { msg, .. } => write!(f, "{msg}"),
             TreeBorrowsUb { title, .. } => write!(f, "{title}"),
-            Deadlock => write!(f, "the evaluated program deadlocked"),
+            GlobalDeadlock => write!(f, "the evaluated program deadlocked"),
+            LocalDeadlock => write!(f, "a thread deadlocked"),
             MultipleSymbolDefinitions { link_name, .. } =>
                 write!(f, "multiple definitions of symbol `{link_name}`"),
             SymbolShimClashing { link_name, .. } =>
@@ -245,10 +249,39 @@ pub fn report_result<'tcx>(
                 Some("unsupported operation"),
             StackedBorrowsUb { .. } | TreeBorrowsUb { .. } | DataRace { .. } =>
                 Some("Undefined Behavior"),
-            Deadlock => {
+            LocalDeadlock => {
                 labels.push(format!("this thread got stuck here"));
                 None
             }
+            GlobalDeadlock => {
+                // Global deadlocks are reported differently: just show all blocked threads.
+                // The "active" thread might actually be terminated, so we ignore it.
+                let mut any_pruned = false;
+                for (thread, stack) in ecx.machine.threads.all_blocked_stacks() {
+                    let stacktrace = Frame::generate_stacktrace_from_stack(stack);
+                    let (stacktrace, was_pruned) = prune_stacktrace(stacktrace, &ecx.machine);
+                    any_pruned |= was_pruned;
+                    report_msg(
+                        DiagLevel::Error,
+                        format!("the evaluated program deadlocked"),
+                        vec![format!(
+                            "thread `{}` got stuck here",
+                            ecx.machine.threads.get_thread_display_name(thread)
+                        )],
+                        vec![],
+                        vec![],
+                        &stacktrace,
+                        Some(thread),
+                        &ecx.machine,
+                    )
+                }
+                if any_pruned {
+                    ecx.tcx.dcx().note(
+                        "some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace"
+                    );
+                }
+                return None;
+            }
             MultipleSymbolDefinitions { .. } | SymbolShimClashing { .. } => None,
         };
         #[rustfmt::skip]
@@ -408,9 +441,7 @@ pub fn report_result<'tcx>(
     };
 
     let stacktrace = ecx.generate_stacktrace();
-    let (stacktrace, mut any_pruned) = prune_stacktrace(stacktrace, &ecx.machine);
-
-    let mut show_all_threads = false;
+    let (stacktrace, pruned) = prune_stacktrace(stacktrace, &ecx.machine);
 
     // We want to dump the allocation if this is `InvalidUninitBytes`.
     // Since `format_interp_error` consumes `e`, we compute the outut early.
@@ -425,15 +456,6 @@ pub fn report_result<'tcx>(
             .unwrap();
             writeln!(extra, "{:?}", ecx.dump_alloc(*alloc_id)).unwrap();
         }
-        MachineStop(info) => {
-            let info = info.downcast_ref::<TerminationInfo>().expect("invalid MachineStop payload");
-            match info {
-                TerminationInfo::Deadlock => {
-                    show_all_threads = true;
-                }
-                _ => {}
-            }
-        }
         _ => {}
     }
 
@@ -464,28 +486,8 @@ pub fn report_result<'tcx>(
 
     eprint!("{extra}"); // newlines are already in the string
 
-    if show_all_threads {
-        for (thread, stack) in ecx.machine.threads.all_blocked_stacks() {
-            if thread != ecx.active_thread() {
-                let stacktrace = Frame::generate_stacktrace_from_stack(stack);
-                let (stacktrace, was_pruned) = prune_stacktrace(stacktrace, &ecx.machine);
-                any_pruned |= was_pruned;
-                report_msg(
-                    DiagLevel::Error,
-                    format!("the evaluated program deadlocked"),
-                    vec![format!("this thread got stuck here")],
-                    vec![],
-                    vec![],
-                    &stacktrace,
-                    Some(thread),
-                    &ecx.machine,
-                )
-            }
-        }
-    }
-
     // Include a note like `std` does when we omit frames from a backtrace
-    if any_pruned {
+    if pruned {
         ecx.tcx.dcx().note(
             "some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace",
         );
@@ -574,7 +576,7 @@ pub fn report_msg<'tcx>(
     err.span(span);
 
     // Show main message.
-    if span != DUMMY_SP {
+    if !span.is_dummy() {
         for line in span_msg {
             err.span_label(span, line);
         }
diff --git a/src/tools/miri/src/shims/unix/sync.rs b/src/tools/miri/src/shims/unix/sync.rs
@@ -538,7 +538,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                         throw_ub_format!(
                             "trying to acquire default mutex already locked by the current thread"
                         ),
-                    MutexKind::Normal => throw_machine_stop!(TerminationInfo::Deadlock),
+                    MutexKind::Normal => throw_machine_stop!(TerminationInfo::LocalDeadlock),
                     MutexKind::ErrorCheck => this.eval_libc_i32("EDEADLK"),
                     MutexKind::Recursive => {
                         this.mutex_lock(&mutex.mutex_ref)?;
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr
@@ -1,14 +1,8 @@
-error: the evaluated program deadlocked
-  --> tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC
-   |
-LL |             assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _), 0);
-   |                                                                            ^ this thread got stuck here
-
 error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
-   |                                                                  ^ this thread got stuck here
+   |                                                                  ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -23,6 +17,12 @@ LL | |         })
 LL | |         .join()
    | |_______________^
 
+error: the evaluated program deadlocked
+  --> tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC
+   |
+LL |             assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _), 0);
+   |                                                                            ^ thread `unnamed-ID` got stuck here
+
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
 error: aborting due to 2 previous errors
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_normal_reentrant.rs b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_normal_reentrant.rs
@@ -12,6 +12,6 @@ fn main() {
         assert_eq!(libc::pthread_mutex_lock(&mut mutex as *mut _), 0);
         // A "normal" mutex properly tries to acquire the lock even if its is already held
         // by the current thread -- and then we deadlock.
-        libc::pthread_mutex_lock(&mut mutex as *mut _); //~ ERROR: the evaluated program deadlocked
+        libc::pthread_mutex_lock(&mut mutex as *mut _); //~ ERROR: a thread deadlocked
     }
 }
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_normal_reentrant.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_normal_reentrant.stderr
@@ -1,4 +1,4 @@
-error: the evaluated program deadlocked
+error: a thread deadlocked
   --> tests/fail-dep/concurrency/libc_pthread_mutex_normal_reentrant.rs:LL:CC
    |
 LL |         libc::pthread_mutex_lock(&mut mutex as *mut _);
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_read_write_deadlock_single_thread.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_read_write_deadlock_single_thread.stderr
@@ -2,7 +2,7 @@ error: the evaluated program deadlocked
   --> tests/fail-dep/concurrency/libc_pthread_rwlock_read_write_deadlock_single_thread.rs:LL:CC
    |
 LL |         libc::pthread_rwlock_wrlock(rw.get());
-   |                                             ^ this thread got stuck here
+   |                                             ^ thread `main` got stuck here
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr
@@ -1,14 +1,8 @@
-error: the evaluated program deadlocked
-  --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.rs:LL:CC
-   |
-LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mut _), 0);
-   |                                                                               ^ this thread got stuck here
-
 error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
-   |                                                                  ^ this thread got stuck here
+   |                                                                  ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -23,6 +17,12 @@ LL | |         })
 LL | |         .join()
    | |_______________^
 
+error: the evaluated program deadlocked
+  --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.rs:LL:CC
+   |
+LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mut _), 0);
+   |                                                                               ^ thread `unnamed-ID` got stuck here
+
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
 error: aborting due to 2 previous errors
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock_single_thread.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock_single_thread.stderr
@@ -2,7 +2,7 @@ error: the evaluated program deadlocked
   --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock_single_thread.rs:LL:CC
    |
 LL |         libc::pthread_rwlock_rdlock(rw.get());
-   |                                             ^ this thread got stuck here
+   |                                             ^ thread `main` got stuck here
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr
@@ -1,14 +1,8 @@
-error: the evaluated program deadlocked
-  --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.rs:LL:CC
-   |
-LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mut _), 0);
-   |                                                                               ^ this thread got stuck here
-
 error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
-   |                                                                  ^ this thread got stuck here
+   |                                                                  ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -23,6 +17,12 @@ LL | |         })
 LL | |         .join()
    | |_______________^
 
+error: the evaluated program deadlocked
+  --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.rs:LL:CC
+   |
+LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mut _), 0);
+   |                                                                               ^ thread `unnamed-ID` got stuck here
+
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
 error: aborting due to 2 previous errors
diff --git a/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock_single_thread.stderr b/src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock_single_thread.stderr
@@ -2,7 +2,7 @@ error: the evaluated program deadlocked
   --> tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock_single_thread.rs:LL:CC
    |
 LL |         libc::pthread_rwlock_wrlock(rw.get());
-   |                                             ^ this thread got stuck here
+   |                                             ^ thread `main` got stuck here
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
diff --git a/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr b/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr
@@ -1,16 +1,8 @@
-error: the evaluated program deadlocked
-  --> tests/fail-dep/concurrency/windows_join_main.rs:LL:CC
-   |
-LL |             assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJECT_0);
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this thread got stuck here
-   |
-   = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
-
 error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
-   |                                                                                          ^ this thread got stuck here
+   |                                                                                          ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -26,6 +18,14 @@ LL | |             assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_O
 LL | |     .join()
    | |___________^
 
+error: the evaluated program deadlocked
+  --> tests/fail-dep/concurrency/windows_join_main.rs:LL:CC
+   |
+LL |             assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJECT_0);
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ thread `unnamed-ID` got stuck here
+   |
+   = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
 error: aborting due to 2 previous errors
diff --git a/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr b/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr
@@ -1,14 +1,8 @@
-error: the evaluated program deadlocked
-  --> tests/fail-dep/concurrency/windows_join_self.rs:LL:CC
-   |
-LL |             assert_eq!(WaitForSingleObject(native, INFINITE), WAIT_OBJECT_0);
-   |                                                            ^ this thread got stuck here
-
 error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
-   |                                                                                          ^ this thread got stuck here
+   |                                                                                          ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -26,6 +20,12 @@ LL | |     })
 LL | |     .join()
    | |___________^
 
+error: the evaluated program deadlocked
+  --> tests/fail-dep/concurrency/windows_join_self.rs:LL:CC
+   |
+LL |             assert_eq!(WaitForSingleObject(native, INFINITE), WAIT_OBJECT_0);
+   |                                                            ^ thread `unnamed-ID` got stuck here
+
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
 error: aborting due to 2 previous errors
diff --git a/src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr b/src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr
@@ -2,7 +2,7 @@ error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
-   |                                                                  ^ this thread got stuck here
+   |                                                                  ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -18,7 +18,7 @@ error: the evaluated program deadlocked
   --> tests/fail-dep/libc/eventfd_block_read_twice.rs:LL:CC
    |
 LL |         let res: i64 = unsafe { libc::read(fd, buf.as_mut_ptr().cast(), 8).try_into().unwrap() };
-   |                                                                          ^ this thread got stuck here
+   |                                                                          ^ thread `unnamed-ID` got stuck here
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
diff --git a/src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr b/src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr
@@ -2,7 +2,7 @@ error: the evaluated program deadlocked
   --> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
    |
 LL |         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
-   |                                                                  ^ this thread got stuck here
+   |                                                                  ^ thread `main` got stuck here
    |
    = note: BACKTRACE:
    = note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
@@ -18,7 +18,7 @@ error: the evaluated program deadlocked
   --> tests/fail-dep/libc/eventfd_block_write_twice.rs:LL:CC
    |
 LL |             libc::write(fd, sized_8_data.as_ptr() as *const libc::c_void, 8).try_into().unwrap()
-   |                                                                            ^ this thread got stuck here
+   |                                                                            ^ thread `unnamed-ID` got stuck here
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
diff --git a/src/tools/miri/tests/fail-dep/libc/fcntl_fsetfl_while_blocking.rs b/src/tools/miri/tests/fail-dep/libc/fcntl_fsetfl_while_blocking.rs
@@ -1,5 +1,4 @@
 //@ignore-target: windows # Sockets/pipes are not implemented yet
-//~^ ERROR: the evaluated program deadlocked
 //@compile-flags: -Zmiri-deterministic-concurrency
 use std::thread;
 
diff --git a/src/tools/miri/tests/fail-dep/libc/fcntl_fsetfl_while_blocking.stderr b/src/tools/miri/tests/fail-dep/libc/fcntl_fsetfl_while_blocking.stderr
@@ -1,15 +1,10 @@
-error: the evaluated program deadlocked
-   |
-   = note: this thread got stuck here
-   = note: (no span available)
-
 error: the evaluated program deadlocked
   --> tests/fail-dep/libc/fcntl_fsetfl_while_blocking.rs:LL:CC
    |
 LL |     let _res = unsafe { libc::read(fds[0], buf.as_mut_ptr().cast(), buf.len() as libc::size_t) };
-   |                                                                                              ^ this thread got stuck here
+   |                                                                                              ^ thread `main` got stuck here
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
diff --git a/src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr b/src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr
diff --git a/src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr b/src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr
diff --git a/src/tools/miri/tests/fail-dep/libc/socketpair_block_read_twice.stderr b/src/tools/miri/tests/fail-dep/libc/socketpair_block_read_twice.stderr
diff --git a/src/tools/miri/tests/fail-dep/libc/socketpair_block_write_twice.stderr b/src/tools/miri/tests/fail-dep/libc/socketpair_block_write_twice.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
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

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ trait EvalContextPrivExt<'tcx>: MiriInterpCxExt<'tcx> {`
`834`	`834`	`// sleep until the first callback.`
`835`	`835`	`interp_ok(SchedulingAction::Sleep(sleep_time))`
`836`	`836`	`} else {`
`837`		`- throw_machine_stop!(TerminationInfo::Deadlock);`
	`837`	`+ throw_machine_stop!(TerminationInfo::GlobalDeadlock);`
`838`	`838`	`}`
`839`	`839`	`}`
`840`	`840`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ fn main() {`
`12`	`12`	`assert_eq!(libc::pthread_mutex_lock(&mut mutex as *mut _), 0);`
`13`	`13`	`// A "normal" mutex properly tries to acquire the lock even if its is already held`
`14`	`14`	`// by the current thread -- and then we deadlock.`
`15`		`- libc::pthread_mutex_lock(&mut mutex as *mut _); //~ ERROR: the evaluated program deadlocked`
	`15`	`+ libc::pthread_mutex_lock(&mut mutex as *mut _); //~ ERROR: a thread deadlocked`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-error: the evaluated program deadlocked`
	`1`	`+error: a thread deadlocked`
`2`	`2`	`--> tests/fail-dep/concurrency/libc_pthread_mutex_normal_reentrant.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| libc::pthread_mutex_lock(&mut mutex as *mut _);`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: the evaluated program deadlocked`
`2`	`2`	`--> tests/fail-dep/concurrency/libc_pthread_rwlock_read_write_deadlock_single_thread.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| libc::pthread_rwlock_wrlock(rw.get());`
`5`		`- \| ^ this thread got stuck here`
	`5`	+ \| ^ thread `main` got stuck here
`6`	`6`
`7`	`7`	note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: the evaluated program deadlocked`
`2`	`2`	`--> tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock_single_thread.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| libc::pthread_rwlock_rdlock(rw.get());`
`5`		`- \| ^ this thread got stuck here`
	`5`	+ \| ^ thread `main` got stuck here
`6`	`6`
`7`	`7`	note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
`8`	`8`