bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

error via bug! instead of stderr+terminate

Browse source
This commit is contained in:
gnzlbg 2018-03-15 16:51:58 +01:00
parent 4fe6acf972
commit 19b81f6114
2 changed files with 79 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/librustc_trans/builder.rs
View file

@ -962,6 +962,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// https://bugs.llvm.org/show_bug.cgi?id=36732 // https://bugs.llvm.org/show_bug.cgi?id=36732
// is fixed. // is fixed.
let instr = llvm::LLVMRustBuildVectorReduceFAdd(self.llbuilder, acc, src); let instr = llvm::LLVMRustBuildVectorReduceFAdd(self.llbuilder, acc, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceFAdd is not available in LLVM version < 5.0");
}
llvm::LLVMRustSetHasUnsafeAlgebra(instr); llvm::LLVMRustSetHasUnsafeAlgebra(instr);
instr instr
} }
@ -973,6 +976,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// https://bugs.llvm.org/show_bug.cgi?id=36732 // https://bugs.llvm.org/show_bug.cgi?id=36732
// is fixed. // is fixed.
let instr = llvm::LLVMRustBuildVectorReduceFMul(self.llbuilder, acc, src); let instr = llvm::LLVMRustBuildVectorReduceFMul(self.llbuilder, acc, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceFMul is not available in LLVM version < 5.0");
}
llvm::LLVMRustSetHasUnsafeAlgebra(instr); llvm::LLVMRustSetHasUnsafeAlgebra(instr);
instr instr
} }
@ -980,49 +986,80 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
pub fn vector_reduce_add(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_add(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.add"); self.count_insn("vector.reduce.add");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceAdd(self.llbuilder, src) let instr = llvm::LLVMRustBuildVectorReduceAdd(self.llbuilder, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceAdd is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_mul(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_mul(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.mul"); self.count_insn("vector.reduce.mul");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceMul(self.llbuilder, src) let instr = llvm::LLVMRustBuildVectorReduceMul(self.llbuilder, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceMul is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_and(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_and(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.and"); self.count_insn("vector.reduce.and");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceAnd(self.llbuilder, src) let instr = llvm::LLVMRustBuildVectorReduceAnd(self.llbuilder, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceAnd is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_or(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_or(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.or"); self.count_insn("vector.reduce.or");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceOr(self.llbuilder, src) let instr = llvm::LLVMRustBuildVectorReduceOr(self.llbuilder, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceOr is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_xor(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_xor(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.xor"); self.count_insn("vector.reduce.xor");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceXor(self.llbuilder, src) let instr = llvm::LLVMRustBuildVectorReduceXor(self.llbuilder, src);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceXor is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_fmin(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_fmin(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.fmin"); self.count_insn("vector.reduce.fmin");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceFMin(self.llbuilder, src, true) let instr = llvm::LLVMRustBuildVectorReduceFMin(self.llbuilder, src, true);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceFMin is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_fmax(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_fmax(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.fmax"); self.count_insn("vector.reduce.fmax");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceFMax(self.llbuilder, src, true) let instr = llvm::LLVMRustBuildVectorReduceFMax(self.llbuilder, src, true);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceFMax is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_fmin_fast(&self, src: ValueRef) -> ValueRef { pub fn vector_reduce_fmin_fast(&self, src: ValueRef) -> ValueRef {
self.count_insn("vector.reduce.fmin_fast"); self.count_insn("vector.reduce.fmin_fast");
unsafe { unsafe {
let instr = llvm::LLVMRustBuildVectorReduceFMin(self.llbuilder, src, false); let instr = llvm::LLVMRustBuildVectorReduceFMin(self.llbuilder, src, false);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceFMin is not available in LLVM version < 5.0");
}
llvm::LLVMRustSetHasUnsafeAlgebra(instr); llvm::LLVMRustSetHasUnsafeAlgebra(instr);
instr instr
} }
@ -1031,6 +1068,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
self.count_insn("vector.reduce.fmax_fast"); self.count_insn("vector.reduce.fmax_fast");
unsafe { unsafe {
let instr = llvm::LLVMRustBuildVectorReduceFMax(self.llbuilder, src, false); let instr = llvm::LLVMRustBuildVectorReduceFMax(self.llbuilder, src, false);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceFMax is not available in LLVM version < 5.0");
}
llvm::LLVMRustSetHasUnsafeAlgebra(instr); llvm::LLVMRustSetHasUnsafeAlgebra(instr);
instr instr
} }
@ -1038,13 +1078,21 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
pub fn vector_reduce_min(&self, src: ValueRef, is_signed: bool) -> ValueRef { pub fn vector_reduce_min(&self, src: ValueRef, is_signed: bool) -> ValueRef {
self.count_insn("vector.reduce.min"); self.count_insn("vector.reduce.min");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceMin(self.llbuilder, src, is_signed) let instr = llvm::LLVMRustBuildVectorReduceMin(self.llbuilder, src, is_signed);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceMin is not available in LLVM version < 5.0");
}
instr
} }
} }
pub fn vector_reduce_max(&self, src: ValueRef, is_signed: bool) -> ValueRef { pub fn vector_reduce_max(&self, src: ValueRef, is_signed: bool) -> ValueRef {
self.count_insn("vector.reduce.max"); self.count_insn("vector.reduce.max");
unsafe { unsafe {
llvm::LLVMRustBuildVectorReduceMax(self.llbuilder, src, is_signed) let instr = llvm::LLVMRustBuildVectorReduceMax(self.llbuilder, src, is_signed);
if instr.is_null() {
bug!("LLVMRustBuildVectorReduceMax is not available in LLVM version < 5.0");
}
instr
} }
} }

61
src/rustllvm/RustWrapper.cpp
View file

@ -1447,65 +1447,48 @@ LLVMRustBuildVectorReduceFMax(LLVMBuilderRef B, LLVMValueRef Src, bool NoNaN) {
#else #else
void error_and_exit(const char* msg) {
raw_fd_ostream OS(2, false);
OS << ::std::string(msg);
std::exit(EXIT_FAILURE);
}
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceFAdd(LLVMBuilderRef, LLVMValueRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceFAdd(LLVMBuilderRef, LLVMValueRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceFAdd requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceFMul(LLVMBuilderRef, LLVMValueRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceFMul(LLVMBuilderRef, LLVMValueRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceFMul requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceAdd(LLVMBuilderRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceAdd(LLVMBuilderRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceAdd requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceMul(LLVMBuilderRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceMul(LLVMBuilderRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceMul requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceAnd(LLVMBuilderRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceAnd(LLVMBuilderRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceAnd requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceOr(LLVMBuilderRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceOr(LLVMBuilderRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceOr requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceXor(LLVMBuilderRef, LLVMValueRef Src) { LLVMRustBuildVectorReduceXor(LLVMBuilderRef, LLVMValueRef) {
error_and_exit("LLVMRustBuildVectorReduceXor requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceMin(LLVMBuilderRef, LLVMValueRef Src, bool) { LLVMRustBuildVectorReduceMin(LLVMBuilderRef, LLVMValueRef, bool) {
error_and_exit("LLVMRustBuildVectorReduceMin requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceMax(LLVMBuilderRef, LLVMValueRef Src, bool) { LLVMRustBuildVectorReduceMax(LLVMBuilderRef, LLVMValueRef, bool) {
error_and_exit("LLVMRustBuildVectorReduceMax requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceFMin(LLVMBuilderRef, LLVMValueRef Src, bool) { LLVMRustBuildVectorReduceFMin(LLVMBuilderRef, LLVMValueRef, bool) {
error_and_exit("LLVMRustBuildVectorReduceFMin requires LLVM >= 5.0"); return nullptr;
return Src;
} }
extern "C" LLVMValueRef extern "C" LLVMValueRef
LLVMRustBuildVectorReduceFMax(LLVMBuilderRef, LLVMValueRef Src, bool) { LLVMRustBuildVectorReduceFMax(LLVMBuilderRef, LLVMValueRef, bool) {
error_and_exit("LLVMRustBuildVectorReduceFMax requires LLVM >= 5.0"); return nullptr;
return Src;
} }
#endif #endif