Skip to content

Use search_for_cycle_permutation to look for fn_sig #148936

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −11
Open

Use search_for_cycle_permutation to look for fn_sig #148936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions compiler/rustc_middle/src/values.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,25 @@ 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 Some(node) = tcx.hir_get_if_local(def_id)
&& let Some(sig) = node.fn_sig()
{
sig.decl.inputs.len()
} else {
tcx.dcx().abort_if_errors();
unreachable!()
};
let arity = search_for_cycle_permutation(
&cycle_error.cycle,
|cycle| {
if let Some(frame) = cycle.get(0)
&& frame.query.dep_kind == dep_kinds::fn_sig
&& let Some(def_id) = frame.query.def_id
&& let Some(node) = tcx.hir_get_if_local(def_id)
&& let Some(sig) = node.fn_sig()
{
ControlFlow::Break(sig.decl.inputs.len())
} else {
ControlFlow::Continue(())
}
},
|| {
tcx.dcx().abort_if_errors();
unreachable!()
},
);

let fn_sig = ty::Binder::dummy(tcx.mk_fn_sig(
std::iter::repeat_n(err, arity),
Expand Down
Loading