Tidy

Author: MacDue

llvm/lib/Target/AArch64/Utils/AArch64SMEAttributes.cpp

@@ -113,10 +113,8 @@ bool SMECallAttrs::requiresSMChange() const {
 SMECallAttrs::SMECallAttrs(const CallBase &CB)
     : CallerFn(*CB.getFunction()), CalledFn(SMEAttrs::Normal),
       Callsite(CB.getAttributes()), IsIndirect(CB.isIndirectCall()) {
-  if (auto *CalledFunction = CB.getCalledFunction()) {
-    CalledFn = SMEAttrs(*CalledFunction);
-    CalledFn.addKnownFunctionAttrs(CalledFunction->getName());
-  }
+  if (auto *CalledFunction = CB.getCalledFunction())
+    CalledFn = SMEAttrs(*CalledFunction, SMEAttrs::InferAttrsFromName::Yes);
 
   // FIXME: We probably should not allow SME attributes on direct calls but
   // clang duplicates streaming mode attributes at each callsite.

llvm/lib/Target/AArch64/Utils/AArch64SMEAttributes.h

@@ -16,7 +16,6 @@ namespace llvm {
 class Function;
 class CallBase;
 class AttributeList;
-class SMECallAttrs;
 
 /// SMEAttrs is a utility class to parse the SME ACLE attributes on functions.
 /// It helps determine a function's requirements for PSTATE.ZA and PSTATE.SM.
@@ -49,9 +48,15 @@ class SMEAttrs {
     Callsite_Flags = ZT0_Undef
   };
 
+  enum class InferAttrsFromName { No, Yes };
+
   SMEAttrs() = default;
   SMEAttrs(unsigned Mask) { set(Mask); }
-  SMEAttrs(const Function &F) : SMEAttrs(F.getAttributes()) {}
+  SMEAttrs(const Function &F, InferAttrsFromName Infer = InferAttrsFromName::No)
+      : SMEAttrs(F.getAttributes()) {
+    if (Infer == InferAttrsFromName::Yes)
+      addKnownFunctionAttrs(F.getName());
+  }
   SMEAttrs(const AttributeList &L);
   SMEAttrs(StringRef FuncName) { addKnownFunctionAttrs(FuncName); };
 
@@ -140,8 +145,6 @@ class SMEAttrs {
     return Bitmask == Other.Bitmask;
   }
 
-  friend SMECallAttrs;
-
 private:
   void addKnownFunctionAttrs(StringRef FuncName);
 };