Fixed target pattern matching, added int+float const compare

Also added LLVM clone for InstructionValues

Author: TheDan64

src/builder.rs

@@ -582,6 +582,7 @@ impl Builder {
     }
 
     // SubType: <I>(&self, op, lhs: &IntValue<I>, rhs: &IntValue<I>, name) -> IntValue<bool> { ?
+    // FIXME: Don't take llvm-sys op enum
     pub fn build_int_compare(&self, op: LLVMIntPredicate, lhs: &IntValue, rhs: &IntValue, name: &str) -> IntValue {
         let c_string = CString::new(name).expect("Conversion to CString failed unexpectedly");
 
@@ -593,6 +594,7 @@ impl Builder {
     }
 
     // SubType: <F>(&self, op, lhs: &FloatValue<F>, rhs: &FloatValue<F>, name) -> IntValue<bool> { ?
+    // FIXME: Don't take llvm-sys op enum
     pub fn build_float_compare(&self, op: LLVMRealPredicate, lhs: &FloatValue, rhs: &FloatValue, name: &str) -> IntValue {
         let c_string = CString::new(name).expect("Conversion to CString failed unexpectedly");
 

src/targets.rs

@@ -22,10 +22,10 @@ pub enum CodeGenOptLevel {
 
 impl CodeGenOptLevel {
     pub(crate) fn as_u32(&self) -> u32 {
-        match self {
-            Less => 1,
-            Default => 2,
-            Aggressive => 3,
+        match *self {
+            CodeGenOptLevel::Less => 1,
+            CodeGenOptLevel::Default => 2,
+            CodeGenOptLevel::Aggressive => 3,
         }
     }
 }

src/values/float_value.rs

@@ -1,5 +1,6 @@
-use llvm_sys::core::{LLVMConstFNeg, LLVMConstFAdd, LLVMConstFSub, LLVMConstFMul, LLVMConstFDiv, LLVMConstFRem, LLVMConstFPCast, LLVMConstFPToUI, LLVMConstFPToSI, LLVMConstFPTrunc, LLVMConstFPExt};
+use llvm_sys::core::{LLVMConstFNeg, LLVMConstFAdd, LLVMConstFSub, LLVMConstFMul, LLVMConstFDiv, LLVMConstFRem, LLVMConstFPCast, LLVMConstFPToUI, LLVMConstFPToSI, LLVMConstFPTrunc, LLVMConstFPExt, LLVMConstFCmp};
 use llvm_sys::prelude::LLVMValueRef;
+use llvm_sys::LLVMRealPredicate;
 
 use std::ffi::CStr;
 
@@ -156,6 +157,15 @@ impl FloatValue {
     pub fn set_metadata(&self, metadata: &MetadataValue, kind_id: u32) {
         self.float_value.set_metadata(metadata, kind_id)
     }
+
+    // FIXME: Don't take llvm-sys op enum
+    pub fn const_float_compare(&self, op: LLVMRealPredicate, rhs: &FloatValue) -> IntValue {
+        let value = unsafe {
+            LLVMConstFCmp(op, self.as_value_ref(), rhs.as_value_ref())
+        };
+
+        IntValue::new(value)
+    }
 }
 
 impl AsValueRef for FloatValue {

src/values/instruction_value.rs

@@ -1,4 +1,4 @@
-use llvm_sys::core::{LLVMGetInstructionOpcode, LLVMIsTailCall, LLVMGetPreviousInstruction, LLVMGetNextInstruction, LLVMGetInstructionParent, LLVMInstructionEraseFromParent};
+use llvm_sys::core::{LLVMGetInstructionOpcode, LLVMIsTailCall, LLVMGetPreviousInstruction, LLVMGetNextInstruction, LLVMGetInstructionParent, LLVMInstructionEraseFromParent, LLVMInstructionClone};
 use llvm_sys::LLVMOpcode;
 use llvm_sys::prelude::LLVMValueRef;
 
@@ -230,6 +230,16 @@ impl InstructionValue {
     }
 }
 
+impl Clone for InstructionValue {
+    fn clone(&self) -> Self {
+        let value = unsafe {
+            LLVMInstructionClone(self.as_value_ref())
+        };
+
+        InstructionValue::new(value)
+    }
+}
+
 impl AsValueRef for InstructionValue {
     fn as_value_ref(&self) -> LLVMValueRef {
         self.instruction_value.value

src/values/int_value.rs

@@ -1,5 +1,6 @@
-use llvm_sys::core::{LLVMConstNot, LLVMConstNeg, LLVMConstNSWNeg, LLVMConstNUWNeg, LLVMConstAdd, LLVMConstNSWAdd, LLVMConstNUWAdd, LLVMConstSub, LLVMConstNSWSub, LLVMConstNUWSub, LLVMConstMul, LLVMConstNSWMul, LLVMConstNUWMul, LLVMConstUDiv, LLVMConstSDiv, LLVMConstSRem, LLVMConstURem, LLVMConstIntCast, LLVMConstXor, LLVMConstOr, LLVMConstAnd, LLVMConstExactSDiv, LLVMConstShl, LLVMConstLShr, LLVMConstAShr, LLVMConstUIToFP, LLVMConstSIToFP, LLVMConstIntToPtr, LLVMConstTrunc, LLVMConstSExt, LLVMConstZExt, LLVMConstTruncOrBitCast, LLVMConstSExtOrBitCast, LLVMConstZExtOrBitCast, LLVMConstBitCast};
+use llvm_sys::core::{LLVMConstNot, LLVMConstNeg, LLVMConstNSWNeg, LLVMConstNUWNeg, LLVMConstAdd, LLVMConstNSWAdd, LLVMConstNUWAdd, LLVMConstSub, LLVMConstNSWSub, LLVMConstNUWSub, LLVMConstMul, LLVMConstNSWMul, LLVMConstNUWMul, LLVMConstUDiv, LLVMConstSDiv, LLVMConstSRem, LLVMConstURem, LLVMConstIntCast, LLVMConstXor, LLVMConstOr, LLVMConstAnd, LLVMConstExactSDiv, LLVMConstShl, LLVMConstLShr, LLVMConstAShr, LLVMConstUIToFP, LLVMConstSIToFP, LLVMConstIntToPtr, LLVMConstTrunc, LLVMConstSExt, LLVMConstZExt, LLVMConstTruncOrBitCast, LLVMConstSExtOrBitCast, LLVMConstZExtOrBitCast, LLVMConstBitCast, LLVMConstICmp};
 use llvm_sys::prelude::LLVMValueRef;
+use llvm_sys::LLVMIntPredicate;
 
 use std::ffi::CStr;
 
@@ -355,6 +356,15 @@ impl IntValue {
     pub fn set_metadata(&self, metadata: &MetadataValue, kind_id: u32) {
         self.int_value.set_metadata(metadata, kind_id)
     }
+
+    // FIXME: Don't take llvm-sys op enum
+    pub fn const_int_compare(&self, op: LLVMIntPredicate, rhs: &IntValue) -> IntValue {
+        let value = unsafe {
+            LLVMConstICmp(op, self.as_value_ref(), rhs.as_value_ref())
+        };
+
+        IntValue::new(value)
+    }
 }
 
 impl AsValueRef for IntValue {