Skip to content

Commit 2b9628d

Browse files
committed
---
yaml --- r: 60603 b: refs/heads/auto c: 15e4438 h: refs/heads/master i: 60601: 7553689 60599: a685f42 v: v3
1 parent d53d4be commit 2b9628d

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 799f281b43bbd52c01c5e404cc09674ec52eb696
17+
refs/heads/auto: 15e44381af4f6d89fc62111a8425087ccab40665
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/middle/trans/expr.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,10 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
499499
let mut bcx = bcx;
500500
let _icx = bcx.insn_ctxt("trans_rvalue_stmt");
501501

502+
if bcx.unreachable {
503+
return bcx;
504+
}
505+
502506
trace_span!(bcx, expr.span, @shorten(bcx.expr_to_str(expr)));
503507

504508
match expr.node {
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn main() {
12+
return;
13+
while io::stdin().read_line() != ~"quit" { };
14+
}

0 commit comments

Comments
 (0)