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

The function is marked `noreturn`, so it shouldn't have this.
This commit is contained in:
bors 2013-11-03 00:46:01 -07:00
commit 318e1da4a7

View File

@ -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];