diff options
| author | bors <bors@rust-lang.org> | 2013-11-03 00:46:01 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-03 00:46:01 -0700 |
| commit | 318e1da4a79533cf8040ef41dc1b1a2ef861906b (patch) | |
| tree | 5f644912f4d0c128cc06e13d00daf9cd23d41833 /src | |
| parent | 4910b7ac28a8c489672573696e81ef6c8d54d1b3 (diff) | |
| parent | ddbd89b33e7516f1620d2f47b23fcab5f1b4b6fe (diff) | |
| download | rust-318e1da4a79533cf8040ef41dc1b1a2ef861906b.tar.gz rust-318e1da4a79533cf8040ef41dc1b1a2ef861906b.zip | |
auto merge of #10244 : thestinger/rust/abort, r=alexcrichton
The function is marked `noreturn`, so it shouldn't have this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/trans/intrinsic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/intrinsic.rs b/src/librustc/middle/trans/intrinsic.rs index f580683cd4e..ce62b26c9ab 100644 --- a/src/librustc/middle/trans/intrinsic.rs +++ b/src/librustc/middle/trans/intrinsic.rs @@ -221,7 +221,7 @@ pub fn trans_intrinsic(ccx: @mut CrateContext, "abort" => { let llfn = bcx.ccx().intrinsics.get_copy(&("llvm.trap")); Call(bcx, llfn, [], []); - RetVoid(bcx); + Unreachable(bcx); } "size_of" => { let tp_ty = substs.tys[0]; |