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

bors · bors · commit 318e1da4a795 · 2013-11-03T00:46:01.000-07:00
The function is marked `noreturn`, so it shouldn't have this.
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];

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,`
`221`	`221`	`"abort" => {`
`222`	`222`	`let llfn = bcx.ccx().intrinsics.get_copy(&("llvm.trap"));`
`223`	`223`	`Call(bcx, llfn, [], []);`
`224`		`- RetVoid(bcx);`
	`224`	`+ Unreachable(bcx);`
`225`	`225`	`}`
`226`	`226`	`"size_of" => {`
`227`	`227`	`let tp_ty = substs.tys[0];`