Skip to content

Commit b32e091

Browse files
committed
rustc: Make llvm_err non-returning
1 parent a34ad8c commit b32e091

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/rustc/back/link.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ enum output_type {
2424
output_type_exe,
2525
}
2626

27-
fn llvm_err(sess: session, msg: str) unsafe {
27+
fn llvm_err(sess: session, msg: str) -> ! unsafe {
2828
let buf = llvm::LLVMRustGetLastError();
2929
if buf == ptr::null() {
3030
sess.fatal(msg);
@@ -46,7 +46,6 @@ fn load_intrinsics_bc(sess: session) -> option<ModuleRef> {
4646
});
4747
if membuf as uint == 0u {
4848
llvm_err(sess, "installation problem: couldn't open " + path);
49-
fail;
5049
}
5150
let llintrinsicsmod = llvm::LLVMRustParseBitcode(membuf);
5251
llvm::LLVMDisposeMemoryBuffer(membuf);
@@ -70,7 +69,6 @@ fn load_intrinsics_ll(sess: session) -> ModuleRef {
7069
});
7170
if llintrinsicsmod as uint == 0u {
7271
llvm_err(sess, "couldn't parse intrinsics.ll");
73-
fail;
7472
}
7573
ret llintrinsicsmod;
7674
}
@@ -93,7 +91,6 @@ fn link_intrinsics(sess: session, llmod: ModuleRef) {
9391
llvm::LLVMDisposeModule(llintrinsicsmod);
9492
if linkres == False {
9593
llvm_err(sess, "couldn't link the module with the intrinsics");
96-
fail;
9794
}
9895
}
9996

0 commit comments

Comments
 (0)