Skip to content

Commit 88268d7

Browse files
committed
require llvm 6
1 parent ecafa7b commit 88268d7

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

src/librustc_trans/builder.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,13 +913,17 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
913913
pub fn minnum(&self, lhs: ValueRef, rhs: ValueRef) -> ValueRef {
914914
self.count_insn("minnum");
915915
unsafe {
916-
llvm::LLVMRustBuildMinNum(self.llbuilder, lhs, rhs)
916+
let instr = llvm::LLVMRustBuildMinNum(self.llbuilder, lhs, rhs);
917+
bug!("LLVMRustBuildMinNum is not available in LLVM version < 6.0");
918+
instr
917919
}
918920
}
919921
pub fn maxnum(&self, lhs: ValueRef, rhs: ValueRef) -> ValueRef {
920922
self.count_insn("maxnum");
921923
unsafe {
922-
llvm::LLVMRustBuildMaxNum(self.llbuilder, lhs, rhs)
924+
let instr = llvm::LLVMRustBuildMaxNum(self.llbuilder, lhs, rhs);
925+
bug!("LLVMRustBuildMaxNum is not available in LLVM version < 6.0");
926+
instr
923927
}
924928
}
925929

src/rustllvm/RustWrapper.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,7 @@ LLVMRustBuildVectorReduceFMax(LLVMBuilderRef, LLVMValueRef, bool) {
14931493
}
14941494
#endif
14951495

1496+
#if LLVM_VERSION_GE(6, 0)
14961497
extern "C" LLVMValueRef
14971498
LLVMRustBuildMinNum(LLVMBuilderRef B, LLVMValueRef LHS, LLVMValueRef RHS) {
14981499
return wrap(unwrap(B)->CreateMinNum(unwrap(LHS),unwrap(RHS)));
@@ -1501,3 +1502,13 @@ extern "C" LLVMValueRef
15011502
LLVMRustBuildMaxNum(LLVMBuilderRef B, LLVMValueRef LHS, LLVMValueRef RHS) {
15021503
return wrap(unwrap(B)->CreateMaxNum(unwrap(LHS),unwrap(RHS)));
15031504
}
1505+
#else
1506+
extern "C" LLVMValueRef
1507+
LLVMRustBuildMinNum(LLVMBuilderRef, LLVMValueRef, LLVMValueRef) {
1508+
return nullptr;
1509+
}
1510+
extern "C" LLVMValueRef
1511+
LLVMRustBuildMaxNum(LLVMBuilderRef, LLVMValueRef, LLVMValueRef) {
1512+
return nullptr;
1513+
}
1514+
#endif

0 commit comments

Comments
 (0)