-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Tail call diagnostics to include lifetime info #145012
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.
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
Conversation
|
9260c5d
to
9a9f300
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't fix the issue in the other direction, like:
fn foo(_: fn(&())) {
become bar(dummy);
}
fn bar<'a>(_: fn(&'a ())) {}
fn dummy(_: &()) {}
self.report_arguments_mismatch(expr.span, caller_sig, callee_sig); | ||
self.report_arguments_mismatch( | ||
expr.span, | ||
self.caller_ty.fn_sig(self.tcx).skip_binder(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
self.caller_ty.fn_sig(self.tcx).skip_binder(), | |
self.caller_ty.fn_sig(self.tcx).instantiate_identity(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does not work for me
error[E0599]: no method named `instantiate_identity` found for struct `Binder` in the current scope
--> compiler/rustc_mir_build/src/check_tail_calls.rs:137:53
|
137 | self.caller_ty.fn_sig(self.tcx).instantiate_identity(),
| ^^^^^^^^^^^^^^^^^^^^ method not found in `Binder<TyCtxt<'_>, FnSig<TyCtxt<'_>>>`
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, it's a binder, not an early binder. that should be liberated then probably, use tcx.liberate_late_bound_regions
instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd love to hear why current approach is not best just to learn things
Also about 'static
yes it shows, should I include this in test?
4 | become bar(dummy);
| ^^^^^^^^^^^^^^^^^
|
= note: -Ztrack-diagnostics: created at compiler/rustc_mir_build/src/check_tail_calls.rs:368:14
= note: `become` requires caller and callee to have matching signatures
= note: caller signature: `fn(for<'a> fn(&'a ()))`
= note: callee signature: `fn(fn(&'static ()))`
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did tcx.liberate_late_bound_regions
it works but I did not found a better way to obtain DefId
rather than do this
Update TailCallCkVisitor
with adding a field that will contain def id
struct TailCallCkVisitor<'a, 'tcx> {
... // existed fields
def: DefId,
}
And create it like this
let mut visitor = TailCallCkVisitor {
... // eixsted fields
def: def.to_def_id(),
};
This might be a bad solution to pass DefId
like this?
self.report_arguments_mismatch(
expr.span,
self.tcx.liberate_late_bound_regions(self.def, self.caller_ty.fn_sig(self.tcx)),
self.tcx.liberate_late_bound_regions(self.def, ty.fn_sig(self.tcx)),
);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @compiler-errors, when you have a moment, could you take another look and let me know which approach you think works better?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't actually matter what def id you pass. Can you just pass CRATE_DEF_ID
for now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, CRATE_DEF_ID
works, didn't knew about this one
9a9f300
to
b2997d5
Compare
I fixed other direction, and make test description lesser (not want to shrink it to one liner tho) If we have a better way to do so, I'm open for suggestions because it's literally first time me opening anything related to tail call |
You should probably check if this also mentions regions like |
r? compiler-errors |
|
@rustbot author |
b2997d5
to
409125b
Compare
409125b
to
51df1da
Compare
Added |
@bors r+ rollup |
…piler-errors Tail call diagnostics to include lifetime info Fixes rust-lang#144957 r? `@WaffleLapkin` `@compiler-errors`
Rollup of 22 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #122661 (Change the desugaring of `assert!` for better error output) - #140740 (Add `-Zindirect-branch-cs-prefix`) - #142640 (Implement autodiff using intrinsics) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #144865 (Fix tail calls to `#[track_caller]` functions) - #144944 (E0793: Clarify that it applies to unions as well) - #144947 (Fix description of unsigned `checked_exact_div`) - #145004 (Couple of minor cleanups) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145012 (Tail call diagnostics to include lifetime info) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145235 (Minor `[const]` tweaks) - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - #145322 (Resolve the prelude import in `build_reduced_graph`) - #145331 (Make std use the edition 2024 prelude) - #145369 (Do not ICE on private type in field of unresolved struct) - #145378 (Add `FnContext` in parser for diagnostic) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - #145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup
…piler-errors Tail call diagnostics to include lifetime info Fixes rust-lang#144957 r? ``@WaffleLapkin`` ``@compiler-errors``
Rollup of 21 pull requests Successful merges: - #118087 (Add Ref/RefMut try_map method) - #122661 (Change the desugaring of `assert!` for better error output) - #142640 (Implement autodiff using intrinsics) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #144865 (Fix tail calls to `#[track_caller]` functions) - #144944 (E0793: Clarify that it applies to unions as well) - #144947 (Fix description of unsigned `checked_exact_div`) - #145004 (Couple of minor cleanups) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145012 (Tail call diagnostics to include lifetime info) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145235 (Minor `[const]` tweaks) - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute) - #145322 (Resolve the prelude import in `build_reduced_graph`) - #145331 (Make std use the edition 2024 prelude) - #145369 (Do not ICE on private type in field of unresolved struct) - #145378 (Add `FnContext` in parser for diagnostic) - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results") - #145392 (coverage: Remove intermediate data structures from mapping creation) r? `@ghost` `@rustbot` modify labels: rollup
Fixes #144957
r? @WaffleLapkin @compiler-errors