adressing more feedback

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/builder/autodiff.rs

@@ -267,7 +267,10 @@ fn generate_enzyme_call<'ll, 'tcx>(
         }
 
         // Let's crash in case that we messed something up above and generated invalid IR.
-        llvm::LLVMVerifyFunction(outer_fn, llvm::LLVMVerifierFailureAction::LLVMAbortProcessAction);
+        llvm::LLVMRustVerifyFunction(
+            outer_fn,
+            llvm::LLVMRustVerifierFailureAction::LLVMAbortProcessAction,
+        );
     }
 }
 

compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs

@@ -2,8 +2,7 @@
 
 use libc::{c_char, c_uint};
 
-use super::Bool;
-use super::ffi::{Attribute, BasicBlock, Metadata, Module, Type, Value};
+use super::ffi::{BasicBlock, Metadata, Module, Type, Value};
 extern "C" {
     // Enzyme
     pub fn LLVMRustHasMetadata(I: &Value, KindID: c_uint) -> bool;
@@ -12,21 +11,18 @@ extern "C" {
     pub fn LLVMRustDIGetInstMetadata(I: &Value) -> Option<&Metadata>;
     pub fn LLVMRustEraseInstFromParent(V: &Value);
     pub fn LLVMRustGetTerminator<'a>(B: &BasicBlock) -> &'a Value;
+    pub fn LLVMRustVerifyFunction(V: &Value, action: LLVMRustVerifierFailureAction) -> bool;
 
     pub fn LLVMGetFunctionCallConv(F: &Value) -> c_uint;
     pub fn LLVMGetReturnType(T: &Type) -> &Type;
-    pub fn LLVMDumpModule(M: &Module);
-    pub fn LLVMCountStructElementTypes(T: &Type) -> c_uint;
-    pub fn LLVMVerifyFunction(V: &Value, action: LLVMVerifierFailureAction) -> Bool;
     pub fn LLVMGetParams(Fnc: &Value, parms: *mut &Value);
     pub fn LLVMGetNamedFunction(M: &Module, Name: *const c_char) -> Option<&Value>;
-    pub fn LLVMIsEnumAttribute(A: &Attribute) -> Bool;
-    pub fn LLVMIsStringAttribute(A: &Attribute) -> Bool;
 }
 
 #[repr(C)]
-pub enum LLVMVerifierFailureAction {
-    LLVMAbortProcessAction,
-    LLVMPrintMessageAction,
-    LLVMReturnStatusAction,
+#[derive(Copy, Clone, PartialEq)]
+pub enum LLVMRustVerifierFailureAction {
+    LLVMAbortProcessAction = 0,
+    LLVMPrintMessageAction = 1,
+    LLVMReturnStatusAction = 2,
 }

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -1,6 +1,7 @@
 #include "LLVMWrapper.h"
 
 #include "llvm-c/Core.h"
+#include "llvm-c/Analysis.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
@@ -165,6 +166,31 @@ extern "C" LLVMValueRef LLVMRustGetNamedValue(LLVMModuleRef M, const char *Name,
   return wrap(unwrap(M)->getNamedValue(StringRef(Name, NameLen)));
 }
 
+enum class LLVMRustVerifierFailureAction {
+    AbortProcessAction = 0,
+    PrintMessageAction = 1,
+    ReturnStatusAction = 2,
+};
+
+static LLVMVerifierFailureAction fromRust(LLVMRustVerifierFailureAction Action) {
+  switch (Action) {
+    case LLVMRustVerifierFailureAction::AbortProcessAction:
+      return LLVMAbortProcessAction;
+    case LLVMRustVerifierFailureAction::PrintMessageAction:
+      return LLVMPrintMessageAction;
+    case LLVMRustVerifierFailureAction::ReturnStatusAction:
+      return LLVMReturnStatusAction;
+  }
+  report_fatal_error("Invalid LLVMVerifierFailureAction value!");
+}
+
+//    pub fn LLVMRustVerifyFunction(V: &Value, action: LLVMRustVerifierFailureAction) -> Bool;
+extern "C" bool LLVMRustVerifyFunction(LLVMValueRef Fn,
+                                       LLVMRustVerifierFailureAction Action) {
+  //Function *F = unwrap<Function>(Fn);
+  return LLVMVerifyFunction(Fn, fromRust(Action));
+}
+
 enum class LLVMRustTailCallKind {
   None,
   Tail,