diff --git a/compiler/rustc_middle/src/query/plumbing.rs b/compiler/rustc_middle/src/query/plumbing.rs index 72330eab30d5..33c38adcef05 100644 --- a/compiler/rustc_middle/src/query/plumbing.rs +++ b/compiler/rustc_middle/src/query/plumbing.rs @@ -136,8 +136,12 @@ pub struct QueryVTable<'tcx, C: QueryCache> { /// For `no_hash` queries, this function pointer is None. pub hash_value_fn: Option, &C::Value) -> Fingerprint>, - pub value_from_cycle_error: - fn(tcx: TyCtxt<'tcx>, cycle_error: CycleError, guar: ErrorGuaranteed) -> C::Value, + pub value_from_cycle_error: fn( + tcx: TyCtxt<'tcx>, + key: C::Key, + cycle_error: CycleError, + guar: ErrorGuaranteed, + ) -> C::Value, pub format_value: fn(&C::Value) -> String, /// Formats a human-readable description of this query and its key, as diff --git a/compiler/rustc_query_impl/src/execution.rs b/compiler/rustc_query_impl/src/execution.rs index a892958d6a81..d8dc004f1cf7 100644 --- a/compiler/rustc_query_impl/src/execution.rs +++ b/compiler/rustc_query_impl/src/execution.rs @@ -125,17 +125,18 @@ fn gather_active_jobs<'tcx, C>( fn mk_cycle<'tcx, C: QueryCache>( query: &'tcx QueryVTable<'tcx, C>, tcx: TyCtxt<'tcx>, + key: C::Key, cycle_error: CycleError, ) -> C::Value { let error = report_cycle(tcx.sess, &cycle_error); match query.cycle_error_handling { CycleErrorHandling::Error => { let guar = error.emit(); - (query.value_from_cycle_error)(tcx, cycle_error, guar) + (query.value_from_cycle_error)(tcx, key, cycle_error, guar) } CycleErrorHandling::DelayBug => { let guar = error.delay_as_bug(); - (query.value_from_cycle_error)(tcx, cycle_error, guar) + (query.value_from_cycle_error)(tcx, key, cycle_error, guar) } } } @@ -219,6 +220,7 @@ fn drop(&mut self) { fn cycle_error<'tcx, C: QueryCache>( query: &'tcx QueryVTable<'tcx, C>, tcx: TyCtxt<'tcx>, + key: C::Key, try_execute: QueryJobId, span: Span, ) -> (C::Value, Option) { @@ -229,7 +231,7 @@ fn cycle_error<'tcx, C: QueryCache>( .expect("failed to collect active queries"); let error = find_cycle_in_stack(try_execute, job_map, ¤t_query_job(), span); - (mk_cycle(query, tcx, error.lift()), None) + (mk_cycle(query, tcx, key, error.lift()), None) } #[inline(always)] @@ -274,7 +276,7 @@ fn wait_for_query<'tcx, C: QueryCache>( (v, Some(index)) } - Err(cycle) => (mk_cycle(query, tcx, cycle.lift()), None), + Err(cycle) => (mk_cycle(query, tcx, key, cycle.lift()), None), } } @@ -337,7 +339,7 @@ fn try_execute_query<'tcx, C: QueryCache, const INCR: bool>( // If we are single-threaded we know that we have cycle error, // so we just return the error. - cycle_error(query, tcx, id, span) + cycle_error(query, tcx, key, id, span) } } ActiveKeyStatus::Poisoned => FatalError.raise(), diff --git a/compiler/rustc_query_impl/src/from_cycle_error.rs b/compiler/rustc_query_impl/src/from_cycle_error.rs index 0b7f69765823..c69d3eb9a0f0 100644 --- a/compiler/rustc_query_impl/src/from_cycle_error.rs +++ b/compiler/rustc_query_impl/src/from_cycle_error.rs @@ -15,34 +15,34 @@ use rustc_middle::ty::layout::{LayoutError, TyAndLayout}; use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_middle::{bug, span_bug}; -use rustc_span::def_id::LocalDefId; +use rustc_span::def_id::{DefId, LocalDefId}; use rustc_span::{ErrorGuaranteed, Span}; use crate::job::report_cycle; pub(crate) fn specialize_query_vtables<'tcx>(vtables: &mut QueryVTables<'tcx>) { vtables.type_of.value_from_cycle_error = - |tcx, _, guar| erase_val(ty::EarlyBinder::bind(Ty::new_error(tcx, guar))); + |tcx, _, _, guar| erase_val(ty::EarlyBinder::bind(Ty::new_error(tcx, guar))); vtables.type_of_opaque_hir_typeck.value_from_cycle_error = - |tcx, _, guar| erase_val(ty::EarlyBinder::bind(Ty::new_error(tcx, guar))); + |tcx, _, _, guar| erase_val(ty::EarlyBinder::bind(Ty::new_error(tcx, guar))); vtables.erase_and_anonymize_regions_ty.value_from_cycle_error = - |tcx, _, guar| erase_val(Ty::new_error(tcx, guar)); + |tcx, _, _, guar| erase_val(Ty::new_error(tcx, guar)); - vtables.fn_sig.value_from_cycle_error = |tcx, cycle, guar| erase_val(fn_sig(tcx, cycle, guar)); + vtables.fn_sig.value_from_cycle_error = |tcx, key, _, guar| erase_val(fn_sig(tcx, key, guar)); vtables.check_representability.value_from_cycle_error = - |tcx, cycle, guar| check_representability(tcx, cycle, guar); + |tcx, _, cycle, guar| check_representability(tcx, cycle, guar); vtables.check_representability_adt_ty.value_from_cycle_error = - |tcx, cycle, guar| check_representability(tcx, cycle, guar); + |tcx, _, cycle, guar| check_representability(tcx, cycle, guar); vtables.variances_of.value_from_cycle_error = - |tcx, cycle, guar| erase_val(variances_of(tcx, cycle, guar)); + |tcx, _, cycle, guar| erase_val(variances_of(tcx, cycle, guar)); vtables.layout_of.value_from_cycle_error = - |tcx, cycle, guar| erase_val(layout_of(tcx, cycle, guar)); + |tcx, _, cycle, guar| erase_val(layout_of(tcx, cycle, guar)); } pub(crate) fn default<'tcx>(tcx: TyCtxt<'tcx>, cycle_error: CycleError, query_name: &str) -> ! { @@ -57,15 +57,12 @@ pub(crate) fn default<'tcx>(tcx: TyCtxt<'tcx>, cycle_error: CycleError, query_na fn fn_sig<'tcx>( tcx: TyCtxt<'tcx>, - cycle_error: CycleError, + def_id: DefId, guar: ErrorGuaranteed, ) -> ty::EarlyBinder<'tcx, ty::PolyFnSig<'tcx>> { let err = Ty::new_error(tcx, guar); - let arity = if let Some(info) = cycle_error.cycle.get(0) - && info.frame.dep_kind == DepKind::fn_sig - && let Some(def_id) = info.frame.def_id - && let Some(node) = tcx.hir_get_if_local(def_id) + let arity = if let Some(node) = tcx.hir_get_if_local(def_id) && let Some(sig) = node.fn_sig() { sig.decl.inputs.len() diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index ddce89234590..78d5fd3de1f0 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -487,7 +487,7 @@ pub(crate) fn make_query_vtable<'tcx>(incremental: bool) #[cfg(not($cache_on_disk))] is_loadable_from_disk_fn: |_tcx, _key, _index| false, - value_from_cycle_error: |tcx, cycle, _| { + value_from_cycle_error: |tcx, _, cycle, _| { $crate::from_cycle_error::default(tcx, cycle, stringify!($name)) },