Fix ICE when calling non-functions within closures #46780
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
| fn main() { | ||
| struct Foo; | ||
| (1 .. 2).find(|_| Foo(0) == 0); //~ ERROR expected function, found `main::Foo` | ||
| } |
There was a problem hiding this comment.
Whoops, that's what I get for late-night commits. Fixed.
|
Your code does not compile libcore, and I suspect it allows such aberrant code as fn foo<F: FnMut()>(f: &F) {
(*f)();
} |
The visitor for walking function bodies did not previously properly handle error-cases for function calls. These are now ignored, preventing the panic.
|
Not quite sure what happened, but that previous commit was entirely wrong. Sorry, it should be fixed now. |
| ty::ImmBorrow, | ||
| ClosureInvocation); | ||
| let type_dependent_defs = self.mc.tables.type_dependent_defs(); | ||
| if type_dependent_defs.contains_key(call.hir_id) { |
There was a problem hiding this comment.
Could you use this instead? It's more standard.
if let Some(def) = type_dependent_defs.get(call.hir_id)There was a problem hiding this comment.
I would actually prefer
let def_id = match type_dependent_defs.get(call.hir_id) {
Some(def) => def.def_id(),
None => tcx.sess.delay_span_bug(call.span, "no type-dependant def for overloaded call?)
};as that would make sure we get an ICE if there's ever a mismatch.
There was a problem hiding this comment.
Isn't an ICE exactly what we're trying to avoid in this situation? In the issue this fix addresses, this function is called for a struct (with no type-dependent call definition) — an error has already been logged, we just want to make sure we don't attempt anything else with it.
EDIT: delay_span_bug will only ICE if no errors have been reported when this occurs.
|
r=me with comment addressed |
|
|
I'll r+ when travis is green |
|
@bors r+ |
|
📌 Commit 5741dcd has been approved by |
kennytm
added
the
S-waiting-on-bors
Fix ICE when calling non-functions within closures The visitor for walking function bodies did not previously properly handle error-cases for function calls. These are now ignored, preventing the panic. This fixes rust-lang#46771.
The visitor for walking function bodies did not previously properly
handle error-cases for function calls. These are now ignored,
preventing the panic. This fixes #46771.