Fixups

Author: MacDue

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

@@ -8642,13 +8642,13 @@ static void analyzeCallOperands(const AArch64TargetLowering &TLI,
 }
 
 static SMECallAttrs
-getSMECallAttrs(const Function &Function,
+getSMECallAttrs(const Function &Caller,
                 const TargetLowering::CallLoweringInfo &CLI) {
   if (CLI.CB)
     return SMECallAttrs(*CLI.CB);
   if (auto *ES = dyn_cast<ExternalSymbolSDNode>(CLI.Callee))
-    return SMECallAttrs(SMEAttrs(Function), SMEAttrs(ES->getSymbol()));
-  return SMECallAttrs(SMEAttrs(Function), SMEAttrs(SMEAttrs::Normal));
+    return SMECallAttrs(SMEAttrs(Caller), SMEAttrs(ES->getSymbol()));
+  return SMECallAttrs(SMEAttrs(Caller), SMEAttrs(SMEAttrs::Normal));
 }
 
 bool AArch64TargetLowering::isEligibleForTailCallOptimization(
@@ -8964,7 +8964,8 @@ static SDValue emitSMEStateSaveRestore(const AArch64TargetLowering &TLI,
   return TLI.LowerCallTo(CLI).second;
 }
 
-static unsigned getSMCondition(const SMECallAttrs &CallAttrs) {
+static AArch64SME::ToggleCondition
+getSMToggleCondition(const SMECallAttrs &CallAttrs) {
   if (!CallAttrs.caller().hasStreamingCompatibleInterface() ||
       CallAttrs.caller().hasStreamingBody())
     return AArch64SME::Always;
@@ -9473,9 +9474,9 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
       InGlue = Chain.getValue(1);
     }
 
-    SDValue NewChain =
-        changeStreamingMode(DAG, DL, CallAttrs.callee().hasStreamingInterface(),
-                            Chain, InGlue, getSMCondition(CallAttrs), PStateSM);
+    SDValue NewChain = changeStreamingMode(
+        DAG, DL, CallAttrs.callee().hasStreamingInterface(), Chain, InGlue,
+        getSMToggleCondition(CallAttrs), PStateSM);
     Chain = NewChain.getValue(0);
     InGlue = NewChain.getValue(1);
   }
@@ -9662,7 +9663,7 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
     assert(PStateSM && "Expected a PStateSM to be set");
     Result = changeStreamingMode(
         DAG, DL, !CallAttrs.callee().hasStreamingInterface(), Result, InGlue,
-        getSMCondition(CallAttrs), PStateSM);
+        getSMToggleCondition(CallAttrs), PStateSM);
 
     if (!Subtarget->isTargetDarwin() || Subtarget->hasSVE()) {
       InGlue = Result.getValue(1);

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

@@ -90,7 +90,7 @@ void SMEAttrs::addKnownFunctionAttrs(StringRef FuncName) {
   if (FuncName == "__arm_sme_save" || FuncName == "__arm_sme_restore" ||
       FuncName == "__arm_sme_state_size")
     KnownAttrs |= SMEAttrs::SM_Compatible | SMEAttrs::SME_ABI_Routine;
-  set(KnownAttrs, /*Enable=*/true);
+  set(KnownAttrs);
 }
 
 bool SMECallAttrs::requiresSMChange() const {

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

@@ -45,7 +45,7 @@ class SMEAttrs {
     ZA_Mask = 0b111 << ZA_Shift,
     ZT0_Shift = 9,
     ZT0_Mask = 0b111 << ZT0_Shift,
-    Callsite_Flags = ZT0_Undef
+    CallSiteFlags_Mask = ZT0_Undef
   };
 
   enum class InferAttrsFromName { No, Yes };
@@ -133,12 +133,12 @@ class SMEAttrs {
 
   SMEAttrs operator|(SMEAttrs Other) const {
     SMEAttrs Merged(*this);
-    Merged.set(Other.Bitmask, /*Enable=*/true);
+    Merged.set(Other.Bitmask);
     return Merged;
   }
 
   SMEAttrs withoutPerCallsiteFlags() const {
-    return (Bitmask & ~Callsite_Flags);
+    return (Bitmask & ~CallSiteFlags_Mask);
   }
 
   bool operator==(SMEAttrs const &Other) const {