Auto merge of #154727 - JonathanBrouwer:rollup-I3Rg5V6, r=JonathanBrouwer

Rollup of 20 pull requests

Successful merges:

 - rust-lang/rust#153105 (Compute the result of a projection type with region errors)
 - rust-lang/rust#153532 (Attributes containing rustc)
 - rust-lang/rust#153960 (Make `layout_of` cycles fatal errors)
 - rust-lang/rust#154527 (Emit pre-expansion feature gate warnings for negative impls and specialization)
 - rust-lang/rust#154666 (Remove `StableHashContext` impls)
 - rust-lang/rust#154669 (Introduce #[diagnostic::on_move] on `Arc`)
 - rust-lang/rust#154710 (opaque_generic_const_args -> generic_const_args)
 - rust-lang/rust#154712 (Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph")
 - rust-lang/rust#153614 (`FindParamInClause` handle edge-cases)
 - rust-lang/rust#154213 (tidy-alphabetical: fix line number in error message)
 - rust-lang/rust#154425 (Migrate transmute tests)
 - rust-lang/rust#154442 (Export `derive` at the crate root: `core::derive` and `std::derive`)
 - rust-lang/rust#154469 (mGCA: Lower spans for literal const args)
 - rust-lang/rust#154578 (Rename `probe_ty_var` to `try_resolve_ty_var`)
 - rust-lang/rust#154615 (Moving issues)
 - rust-lang/rust#154644 (rustdoc: seperate methods and associated functions in sidebar)
 - rust-lang/rust#154660 (Avoid creating async return opaques for foreign async fns)
 - rust-lang/rust#154671 (Add a test for a past ICE when calling a const fn of an unresolved type with the wrong number of args)
 - rust-lang/rust#154680 ([rustdoc] Replace `DocContext` with `TyCtxt` wherever possible)
 - rust-lang/rust#154709 (Revert `Ty` type alias in `rustc_type_ir`)

Author: bors

src/eval.rs

@@ -10,6 +10,7 @@ use std::{iter, thread};
 
 use rustc_abi::ExternAbi;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_errors::FatalErrorMarker;
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv, LayoutCx};
@@ -477,7 +478,11 @@ pub fn eval_entry<'tcx>(
     let res: thread::Result<InterpResult<'_, !>> =
         panic::catch_unwind(AssertUnwindSafe(|| ecx.run_threads()));
     let res = res.unwrap_or_else(|panic_payload| {
-        ecx.handle_ice();
+        // rustc "handles" some errors by unwinding with FatalErrorMarker
+        // (after emitting suitable diagnostics), so do not treat those as ICEs.
+        if !panic_payload.is::<FatalErrorMarker>() {
+            ecx.handle_ice();
+        }
         panic::resume_unwind(panic_payload)
     });
     // Obtain the result of the execution. This is always an `Err`, but that doesn't necessarily

tests/fail/layout_cycle.rs

@@ -1,5 +1,4 @@
-//@error-in-other-file: a cycle occurred during layout computation
-//~^ ERROR: cycle detected when computing layout of
+//~ ERROR: cycle detected when computing layout of
 
 use std::mem;
 

tests/fail/layout_cycle.stderr

@@ -9,13 +9,6 @@ LL |     const SIZE: usize = intrinsics::size_of::<Self>();
    |     ^^^^^^^^^^^^^^^^^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
-error[E0080]: a cycle occurred during layout computation
-  --> RUSTLIB/core/src/mem/mod.rs:LL:CC
-   |
-LL |     const SIZE: usize = intrinsics::size_of::<Self>();
-   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `<S<S<()>> as std::mem::SizedTypeProperties>::SIZE` failed here
-
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-Some errors have detailed explanations: E0080, E0391.
-For more information about an error, try `rustc --explain E0080`.
+For more information about this error, try `rustc --explain E0391`.