Skip to content

Commit

Permalink
Auto merge of #43745 - kennytm:fix-43162, r=aturon
Browse files Browse the repository at this point in the history
Type-check `break value;` even outside of `loop {}`.

Fix #43162, fix #43727.
  • Loading branch information
bors committed Aug 11, 2017
2 parents 73c3f55 + 3cb23a7 commit 9868352
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/librustc_typeck/check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3652,6 +3652,20 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
// inside a loop at all, which is caught by the
// loop-checking pass.
assert!(self.tcx.sess.err_count() > 0);

// We still need to assign a type to the inner expression to
// prevent the ICE in #43162.
if let Some(ref e) = *expr_opt {
self.check_expr_with_hint(e, tcx.types.err);

// ... except when we try to 'break rust;'.
// ICE this expression in particular (see #43162).
if let hir::ExprPath(hir::QPath::Resolved(_, ref path)) = e.node {
if path.segments.len() == 1 && path.segments[0].name == "rust" {
fatally_break_rust(self.tcx.sess);
}
}
}
}

// the type of a `break` is always `!`, since it diverges
Expand Down Expand Up @@ -4880,3 +4894,20 @@ pub fn check_bounds_are_used<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
}
}
}

fn fatally_break_rust(sess: &Session) {
let handler = sess.diagnostic();
handler.span_bug_no_panic(
MultiSpan::new(),
"It looks like you're trying to break rust; would you like some ICE?",
);
handler.note_without_error("the compiler expectedly panicked. this is a feature.");
handler.note_without_error(
"we would appreciate a joke overview: \
https://github.com/rust-lang/rust/issues/43162#issuecomment-320764675"
);
handler.note_without_error(&format!("rustc {} running on {}",
option_env!("CFG_VERSION").unwrap_or("unknown_version"),
::session::config::host_triple(),
));
}
17 changes: 17 additions & 0 deletions src/test/compile-fail/issue-43162.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn foo() -> bool {
break true; //~ ERROR E0268
}

fn main() {
break {}; //~ ERROR E0268
}
6 changes: 6 additions & 0 deletions src/test/run-pass/loop-break-value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,10 @@ pub fn main() {
panic!("from outer");
};
assert_eq!(break_from_while_to_outer, 567);

let rust = true;
let value = loop {
break rust;
};
assert!(value);
}

0 comments on commit 9868352

Please sign in to comment.