---

yaml
---
r: 11631
b: refs/heads/master
c: b32e091
h: refs/heads/master
i:
  11629: 109e85d
  11627: 9d762b5
  11623: e065254
  11615: 8061df7
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a34ad8c4e7d7e8bb6690e9c657216185c0c16d17
+refs/heads/master: b32e09172c42edaab606d74898255966cf5e276a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/back/link.rs

@@ -24,7 +24,7 @@ enum output_type {
     output_type_exe,
 }
 
-fn llvm_err(sess: session, msg: str) unsafe {
+fn llvm_err(sess: session, msg: str) -> ! unsafe {
     let buf = llvm::LLVMRustGetLastError();
     if buf == ptr::null() {
         sess.fatal(msg);
@@ -46,7 +46,6 @@ fn load_intrinsics_bc(sess: session) -> option<ModuleRef> {
                                    });
     if membuf as uint == 0u {
         llvm_err(sess, "installation problem: couldn't open " + path);
-        fail;
     }
     let llintrinsicsmod = llvm::LLVMRustParseBitcode(membuf);
     llvm::LLVMDisposeMemoryBuffer(membuf);
@@ -70,7 +69,6 @@ fn load_intrinsics_ll(sess: session) -> ModuleRef {
                                         });
     if llintrinsicsmod as uint == 0u {
         llvm_err(sess, "couldn't parse intrinsics.ll");
-        fail;
     }
     ret llintrinsicsmod;
 }
@@ -93,7 +91,6 @@ fn link_intrinsics(sess: session, llmod: ModuleRef) {
     llvm::LLVMDisposeModule(llintrinsicsmod);
     if linkres == False {
         llvm_err(sess, "couldn't link the module with the intrinsics");
-        fail;
     }
 }