[llvm] [AMDGPULowerBufferFatPointers] Use typeIncompatible() (PR #122902)

[Nikita Popov via llvm-commits]

https://github.com/nikic created https://github.com/llvm/llvm-project/pull/122902

Use typeIncompatible() to drop attributes incompatible with the new argument/return type, instead of keeping a custom list.

>From 11fc66db35758794109528213293f832ee7acd37 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov at redhat.com>
Date: Tue, 14 Jan 2025 14:31:29 +0100
Subject: [PATCH] [AMDGPULowerBufferFatPointers] Use typeIncompatible()

Use typeIncompatible() to drop attributes incompatible with the
new argument/return type, instead of keeping a custom list.
---
 .../AMDGPU/AMDGPULowerBufferFatPointers.cpp      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerBufferFatPointers.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerBufferFatPointers.cpp
index 8c6ea5f9bd0f81..657a406e9f7056 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerBufferFatPointers.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerBufferFatPointers.cpp
@@ -1674,14 +1674,6 @@ static Function *moveFunctionAdaptingType(Function *OldF, FunctionType *NewTy,
     }
   }
 
-  AttributeMask PtrOnlyAttrs;
-  for (auto K :
-       {Attribute::Dereferenceable, Attribute::DereferenceableOrNull,
-        Attribute::NoAlias, Attribute::NoCapture, Attribute::NoFree,
-        Attribute::NonNull, Attribute::NullPointerIsValid, Attribute::ReadNone,
-        Attribute::ReadOnly, Attribute::WriteOnly}) {
-    PtrOnlyAttrs.addAttribute(K);
-  }
   SmallVector<AttributeSet> ArgAttrs;
   AttributeList OldAttrs = OldF->getAttributes();
 
@@ -1697,12 +1689,16 @@ static Function *moveFunctionAdaptingType(Function *OldF, FunctionType *NewTy,
     AttributeSet ArgAttr = OldAttrs.getParamAttrs(I);
     // Intrinsics get their attributes fixed later.
     if (OldArgTy != NewArgTy && !IsIntrinsic)
-      ArgAttr = ArgAttr.removeAttributes(NewF->getContext(), PtrOnlyAttrs);
+      ArgAttr = ArgAttr.removeAttributes(
+          NewF->getContext(),
+          AttributeFuncs::typeIncompatible(NewArgTy, ArgAttr));
     ArgAttrs.push_back(ArgAttr);
   }
   AttributeSet RetAttrs = OldAttrs.getRetAttrs();
   if (OldF->getReturnType() != NewF->getReturnType() && !IsIntrinsic)
-    RetAttrs = RetAttrs.removeAttributes(NewF->getContext(), PtrOnlyAttrs);
+    RetAttrs = RetAttrs.removeAttributes(
+        NewF->getContext(),
+        AttributeFuncs::typeIncompatible(NewF->getReturnType(), RetAttrs));
   NewF->setAttributes(AttributeList::get(
       NewF->getContext(), OldAttrs.getFnAttrs(), RetAttrs, ArgAttrs));
   return NewF;