Skip to content

Construct FnSig from a CycleError a bit differently for multiple threads #149062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+13 −3
Closed

Construct FnSig from a CycleError a bit differently for multiple threads #149062

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b172932
Construct FnSig from a CycleError a bit differently for multiple threads
zetanumbers Nov 18, 2025
fd93874
Fallback to use cycle_error.usage for FnSig creation
zetanumbers Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions compiler/rustc_middle/src/values.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::fmt::Write;
use std::ops::ControlFlow;

use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::sync;
use rustc_errors::codes::*;
use rustc_errors::{Applicability, MultiSpan, pluralize, struct_span_code_err};
use rustc_hir as hir;
Expand Down Expand Up @@ -50,9 +51,18 @@ impl<'tcx> Value<TyCtxt<'tcx>> for ty::Binder<'_, ty::FnSig<'_>> {
) -> Self {
let err = Ty::new_error(tcx, guar);

let arity = if let Some(frame) = cycle_error.cycle.get(0)
&& frame.query.dep_kind == dep_kinds::fn_sig
&& let Some(def_id) = frame.query.def_id
let frame = cycle_error.cycle.first().map(|info| &info.query).or_else(|| {
// FIXME: patchwork for #142064
if !sync::is_dyn_thread_safe() {
tcx.dcx().abort_if_errors();
unreachable!()
}
cycle_error.usage.as_ref().map(|(_, query)| query)
});

let arity = if let Some(frame) = frame
&& frame.dep_kind == dep_kinds::fn_sig
&& let Some(def_id) = frame.def_id
&& let Some(node) = tcx.hir_get_if_local(def_id)
&& let Some(sig) = node.fn_sig()
{
Expand Down
Loading