Skip to content

Commit

Permalink
Fix ICE when returning a variable whose declaration is unreachable
Browse files Browse the repository at this point in the history
Fixes #24353
  • Loading branch information
dotdash committed Apr 13, 2015
1 parent 49798c5 commit e891f29
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/librustc_trans/trans/controlflow.rs
Expand Up @@ -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());
Expand Down
16 changes: 16 additions & 0 deletions src/test/run-pass/issue24353.rs
@@ -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
}

0 comments on commit e891f29

Please sign in to comment.