auto merge of #10244 : thestinger/rust/abort, r=alexcrichton

The function is marked `noreturn`, so it shouldn't have this.
rust-lang · Nov 3, 2013 · 318e1da · 318e1da
2 parents 4910b7a + ddbd89b
commit 318e1da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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];