Merge from rustc

Author: RalfJung

src/provenance_gc.rs

@@ -193,12 +193,16 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriInterpCxExt<'mir, 'tcx> {
     }
 
     fn remove_unreachable_allocs(&mut self, allocs: FxHashSet<AllocId>) {
-        let this = self.eval_context_ref();
-        let allocs = LiveAllocs { ecx: this, collected: allocs };
+        let this = self.eval_context_mut();
+        let allocs = LiveAllocs {
+            ecx: this,
+            collected: allocs,
+        };
         this.machine.allocation_spans.borrow_mut().retain(|id, _| allocs.is_live(*id));
         this.machine.intptrcast.borrow_mut().remove_unreachable_allocs(&allocs);
         if let Some(borrow_tracker) = &this.machine.borrow_tracker {
             borrow_tracker.borrow_mut().remove_unreachable_allocs(&allocs);
         }
+        this.remove_unreachable_allocs(&allocs.collected);
     }
 }

tests/extern-so/fail/function_not_in_so.stderr

@@ -10,5 +10,5 @@ LL |         foo();
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_create_main_terminate.stderr

@@ -2,5 +2,5 @@ error: the main thread terminated without waiting for all remaining threads
 
 note: pass `-Zmiri-ignore-leaks` to disable this check
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_create_too_few_args.stderr

@@ -10,5 +10,5 @@ LL |     panic!()
    = note: inside `thread_start` at RUSTLIB/core/src/panic.rs:LL:CC
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_create_too_many_args.stderr

@@ -10,5 +10,5 @@ LL |     panic!()
    = note: inside `thread_start` at RUSTLIB/core/src/panic.rs:LL:CC
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_join_detached.stderr

@@ -11,5 +11,5 @@ LL |         assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_join_joined.stderr

@@ -11,5 +11,5 @@ LL |         assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_join_main.stderr

@@ -11,5 +11,5 @@ LL |             assert_eq!(libc::pthread_join(thread_id, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_join_multiple.stderr

@@ -11,5 +11,5 @@ LL | ...   assert_eq!(libc::pthread_join(native_copy, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

tests/fail-dep/concurrency/libc_pthread_join_self.stderr

@@ -11,5 +11,5 @@ LL |             assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error