bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #24371: dotdash/24353

Browse source 
Fixes #24353
This commit is contained in:
Alex Crichton 2015-04-14 10:55:47 -07:00
commit c24e55b13e
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_trans/trans/controlflow.rs
View file

@ -131,7 +131,9 @@ pub fn trans_block<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
match b.expr {
Some(ref e) => {
bcx = expr::trans_into(bcx, &**e, dest);
if !bcx.unreachable.get() {
bcx = expr::trans_into(bcx, &**e, dest);
}
}
None => {
assert!(dest == expr::Ignore || bcx.unreachable.get());

16
src/test/run-pass/issue24353.rs Normal file
View file

@ -0,0 +1,16 @@
// Copyright 2015 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 main() {
return ();
let x = ();
x
}