Use hasAttributeAtIndex

Author: nikic

llvm/include/llvm/IR/Function.h

@@ -442,6 +442,9 @@ class LLVM_ABI Function : public GlobalObject, public ilist_node<Function> {
   /// gets the attribute from the list of attributes.
   Attribute getAttributeAtIndex(unsigned i, StringRef Kind) const;
 
+  /// Check if attribute of the given kind is set at the given index.
+  bool hasAttributeAtIndex(unsigned Idx, Attribute::AttrKind Kind) const;
+
   /// Return the attribute for the given attribute kind.
   Attribute getFnAttribute(Attribute::AttrKind Kind) const;
 

llvm/lib/IR/Function.cpp

@@ -766,6 +766,11 @@ Attribute Function::getAttributeAtIndex(unsigned i, StringRef Kind) const {
   return AttributeSets.getAttributeAtIndex(i, Kind);
 }
 
+bool Function::hasAttributeAtIndex(unsigned Idx,
+                                   Attribute::AttrKind Kind) const {
+  return AttributeSets.hasAttributeAtIndex(Idx, Kind);
+}
+
 Attribute Function::getFnAttribute(Attribute::AttrKind Kind) const {
   return AttributeSets.getFnAttr(Kind);
 }

llvm/lib/Transforms/Utils/SCCPSolver.cpp

@@ -361,7 +361,7 @@ static void inferAttribute(Function *F, unsigned AttrIndex,
   // Infer nonnull attribute.
   if (Val.isNotConstant() && Val.getNotConstant()->getType()->isPointerTy() &&
       Val.getNotConstant()->isNullValue() &&
-      !F->getAttributeAtIndex(AttrIndex, Attribute::NonNull).isValid()) {
+      !F->hasAttributeAtIndex(AttrIndex, Attribute::NonNull)) {
     F->addAttributeAtIndex(AttrIndex,
                            Attribute::get(F->getContext(), Attribute::NonNull));
   }