add and use better abstractions for Attribute

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -17,17 +17,17 @@ use crate::typetree::to_enzyme_typetree;
 use crate::LlvmCodegenBackend;
 use crate::ModuleLlvm;
 use crate::DiffTypeTree;
-use llvm::{
+use llvm::{LLVMRustGetEnumAttributeAtIndex, LLVMRustAddEnumAttributeAtIndex, LLVMRustRemoveEnumAttributeAtIndex,
     enzyme_rust_forward_diff, enzyme_rust_reverse_diff, BasicBlock, CreateEnzymeLogic,
     CreateTypeAnalysis, EnzymeLogicRef, EnzymeTypeAnalysisRef, LLVMAddFunction,
     LLVMAppendBasicBlockInContext, LLVMBuildCall2, LLVMBuildExtractValue, LLVMBuildRet,
     LLVMCountParams, LLVMCountStructElementTypes, LLVMCreateBuilderInContext, LLVMDeleteFunction,
     LLVMDisposeBuilder, LLVMGetBasicBlockTerminator, LLVMGetElementType, LLVMGetModuleContext,
     LLVMGetParams, LLVMGetReturnType, LLVMPositionBuilderAtEnd, LLVMSetValueName2, LLVMTypeOf,
     LLVMVoidTypeInContext, LLVMGlobalGetValueType, LLVMGetStringAttributeAtIndex,
-    LLVMIsStringAttribute, LLVMRemoveStringAttributeAtIndex, LLVMRemoveEnumAttributeAtIndex, AttributeKind,
-    LLVMGetFirstFunction, LLVMGetNextFunction, LLVMGetEnumAttributeAtIndex, LLVMIsEnumAttribute,
-    LLVMCreateStringAttribute, LLVMRustAddFunctionAttributes, LLVMCreateEnumAttribute, LLVMDumpModule,
+    LLVMIsStringAttribute, LLVMRemoveStringAttributeAtIndex, AttributeKind,
+    LLVMGetFirstFunction, LLVMGetNextFunction, LLVMIsEnumAttribute,
+    LLVMCreateStringAttribute, LLVMRustAddFunctionAttributes, LLVMDumpModule,
     LLVMRustLLVMHasZlibCompressionForDebugSymbols, LLVMRustLLVMHasZstdCompressionForDebugSymbols,
 };
 use rustc_codegen_ssa::back::link::ensure_removed;
@@ -831,7 +831,7 @@ pub(crate) unsafe fn differentiate(
         if LLVMIsStringAttribute(attr) {
             LLVMRemoveStringAttributeAtIndex(lf, c_uint::MAX, myhwattr.as_ptr() as *const c_char, myhwattr.as_bytes().len() as c_uint);
         } else {
-            LLVMRemoveEnumAttributeAtIndex(lf, c_uint::MAX, AttributeKind::SanitizeHWAddress);
+            LLVMRustRemoveEnumAttributeAtIndex(lf, c_uint::MAX, AttributeKind::SanitizeHWAddress);
         }
 
 
@@ -876,13 +876,12 @@ pub(crate) unsafe fn optimize(
             f = LLVMGetNextFunction(lf);
             let myhwattr = "enzyme_hw";
             let myhwv = "";
-            let prevattr = LLVMGetEnumAttributeAtIndex(lf, c_uint::MAX, AttributeKind::SanitizeHWAddress);
+            let prevattr = LLVMRustGetEnumAttributeAtIndex(lf, c_uint::MAX, AttributeKind::SanitizeHWAddress);
             if LLVMIsEnumAttribute(prevattr) {
                 let attr = LLVMCreateStringAttribute(llcx, myhwattr.as_ptr() as *const c_char, myhwattr.as_bytes().len() as c_uint, myhwv.as_ptr() as *const c_char, myhwv.as_bytes().len() as c_uint);
                 LLVMRustAddFunctionAttributes(lf, c_uint::MAX, &attr, 1);
             } else {
-                let attr = LLVMCreateEnumAttribute(llcx, AttributeKind::SanitizeHWAddress, 0);
-                LLVMRustAddFunctionAttributes(lf, c_uint::MAX, &attr, 1);
+                LLVMRustAddEnumAttributeAtIndex(llcx, lf, c_uint::MAX, AttributeKind::SanitizeHWAddress);
             }
 
             } else {

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -191,7 +191,7 @@ pub enum AttributeKind {
     OptimizeNone = 24,
     ReturnsTwice = 25,
     ReadNone = 26,
-    SanitizeHWAddress = 51,
+    SanitizeHWAddress = 28,
     WillReturn = 29,
     StackProtectReq = 30,
     StackProtectStrong = 31,
@@ -980,19 +980,21 @@ pub type GetSymbolsErrorCallback = unsafe extern "C" fn(*const c_char) -> *mut c
 extern "C" {
 
     // Enzyme
-    //pub fn LLVMReplaceAllUsesWith(old: &Value, new: &Value);
-    pub fn GibtsNicht(M: &Module) -> bool;
     pub fn LLVMIsStructTy(ty: &Type) -> bool;
     pub fn LLVMGetReturnType(T: &Type) -> &Type;
     pub fn LLVMDumpModule(M: &Module);
     pub fn LLVMCountStructElementTypes(T: &Type) -> c_uint;
     pub fn LLVMDeleteFunction(V: &Value);
+
+    pub fn LLVMCreateEnumAttribute(C : &Context, Kind: Attribute, val:u64) -> &Attribute;
     pub fn LLVMRemoveStringAttributeAtIndex(F : &Value, Idx: c_uint, K: *const c_char, KLen : c_uint);
     pub fn LLVMGetStringAttributeAtIndex(F : &Value, Idx: c_uint, K: *const c_char, KLen : c_uint) -> &Attribute;
-    pub fn LLVMRemoveEnumAttributeAtIndex(F : &Value, Idx: c_uint, K: AttributeKind);
-    pub fn LLVMGetEnumAttributeAtIndex(F : &Value, Idx: c_uint, K: AttributeKind) -> &Attribute;
+
+    pub fn LLVMAddAttributeAtIndex(F : &Value, Idx: c_uint, K: &Attribute);
+    pub fn LLVMRemoveEnumAttributeAtIndex(F : &Value, Idx: c_uint, K: Attribute);
+    pub fn LLVMGetEnumAttributeAtIndex(F : &Value, Idx: c_uint, K: Attribute) -> &Attribute;
+
     pub fn LLVMIsEnumAttribute(A : &Attribute) -> bool;
-    pub fn LLVMCreateEnumAttribute(C : &Context, Kind: AttributeKind, val:u64) -> &Attribute;
     pub fn LLVMIsStringAttribute(A : &Attribute) -> bool;
     pub fn LLVMVerifyFunction(V: &Value, action: LLVMVerifierFailureAction) -> bool;
     pub fn LLVMGetParams(Fnc: &Value, parms: *mut &Value);
@@ -1207,6 +1209,9 @@ extern "C" {
 
     // Operations on attributes
     pub fn LLVMRustCreateAttrNoValue(C: &Context, attr: AttributeKind) -> &Attribute;
+    pub fn LLVMRustAddEnumAttributeAtIndex(C: &Context, V: &Value, index: c_uint, attr: AttributeKind);
+    pub fn LLVMRustRemoveEnumAttributeAtIndex(V: &Value, index: c_uint, attr: AttributeKind);
+    pub fn LLVMRustGetEnumAttributeAtIndex(V: &Value, index: c_uint, attr: AttributeKind) ->&Attribute;
     pub fn LLVMCreateStringAttribute(
         C: &Context,
         Name: *const c_char,

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -319,6 +319,19 @@ extern "C" LLVMAttributeRef LLVMRustCreateAttrNoValue(LLVMContextRef C,
   return wrap(Attribute::get(*unwrap(C), fromRust(RustAttr)));
 }
 
+extern "C" void LLVMRustRemoveEnumAttributeAtIndex(LLVMValueRef F, size_t index, LLVMRustAttribute RustAttr) {
+  LLVMRemoveEnumAttributeAtIndex(F, index, fromRust(RustAttr));
+}
+
+extern "C" void LLVMRustAddEnumAttributeAtIndex(LLVMContextRef C, LLVMValueRef F, size_t index, LLVMRustAttribute RustAttr) {
+  LLVMAddAttributeAtIndex(F, index, LLVMRustCreateAttrNoValue(C, RustAttr));
+}
+
+extern "C" LLVMAttributeRef LLVMRustGetEnumAttributeAtIndex(LLVMValueRef F, size_t index,
+                                                        LLVMRustAttribute RustAttr) {
+  return LLVMGetEnumAttributeAtIndex(F, index, fromRust(RustAttr));
+}
+
 extern "C" LLVMAttributeRef LLVMRustCreateAlignmentAttr(LLVMContextRef C,
                                                         uint64_t Bytes) {
   return wrap(Attribute::getWithAlignment(*unwrap(C), llvm::Align(Bytes)));