未验证 提交 3f4827c7 编写于 作者: M Mazdak Farrokhzad 提交者: GitHub

Rollup merge of #66863 - osa1:fix_66702, r=cramertj

Check break target availability when checking breaks with values

Fixes #66702

I'll be adding a regression test.
......@@ -582,11 +582,21 @@ fn check_expr_break(
// 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
......
// Breaks with values inside closures used to ICE (#66863)
fn main() {
'some_label: loop {
|| break 'some_label (); //~ ERROR: `break` inside of a closure
}
}
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`.
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册