Skip to content

Commit

Permalink
Rollup merge of rust-lang#66863 - osa1:fix_66702, r=cramertj
Browse files Browse the repository at this point in the history
Check break target availability when checking breaks with values

Fixes rust-lang#66702

I'll be adding a regression test.
  • Loading branch information
Centril committed Dec 5, 2019
2 parents bcf992d + 6857c93 commit 3f4827c
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 4 deletions.
18 changes: 14 additions & 4 deletions src/librustc_typeck/check/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -582,11 +582,21 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// If this is a break with a value, we need to type-check
// the expression. Get an expected type from the loop context.
let opt_coerce_to = {
// We should release `enclosing_breakables` before the `check_expr_with_hint`
// below, so can't move this block of code to the enclosing scope and share
// `ctxt` with the second `encloding_breakables` borrow below.
let mut enclosing_breakables = self.enclosing_breakables.borrow_mut();
enclosing_breakables.find_breakable(target_id)
.coerce
.as_ref()
.map(|coerce| coerce.expected_ty())
match enclosing_breakables.opt_find_breakable(target_id) {
Some(ctxt) =>
ctxt.coerce.as_ref().map(|coerce| coerce.expected_ty()),
None => { // Avoid ICE when `break` is inside a closure (#65383).
self.tcx.sess.delay_span_bug(
expr.span,
"break was outside loop, but no error was emitted",
);
return tcx.types.err;
}
}
};

// If the loop context is not a `loop { }`, then break with
Expand Down
7 changes: 7 additions & 0 deletions src/test/ui/issues/issue-66702-break-outside-loop-val.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Breaks with values inside closures used to ICE (#66863)

fn main() {
'some_label: loop {
|| break 'some_label (); //~ ERROR: `break` inside of a closure
}
}
11 changes: 11 additions & 0 deletions src/test/ui/issues/issue-66702-break-outside-loop-val.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0267]: `break` inside of a closure
--> $DIR/issue-66702-break-outside-loop-val.rs:5:12
|
LL | || break 'some_label ();
| -- ^^^^^^^^^^^^^^^^^^^^ cannot `break` inside of a closure
| |
| enclosing closure

error: aborting due to previous error

For more information about this error, try `rustc --explain E0267`.

0 comments on commit 3f4827c

Please sign in to comment.