Fix ICE when returning a variable whose declaration is unreachable

Fixes #24353

diff --git a/src/librustc_trans/trans/controlflow.rs b/src/librustc_trans/trans/controlflow.rs
index f544efe7401c4dc00a90f1ed0c7fe591dcf55650..8cecc39ec3900093cdc329552d5d268d0e70cad7 100644 (file)
--- a/src/librustc_trans/trans/controlflow.rs
+++ b/src/librustc_trans/trans/controlflow.rs
@@ -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());

diff --git a/src/test/run-pass/issue24353.rs b/src/test/run-pass/issue24353.rs
new file mode 100644 (file)
index 0000000..7a41a01
--- /dev/null
+++ b/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
+}