fixup: rebase and check for new za state

Author: SamTebbs33

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -281,6 +281,8 @@ def err_function_needs_feature : Error<
   "be inlined into function %0 that is compiled without support for '%2'">;
 def err_function_always_inline_attribute_mismatch : Error<
   "always_inline function %1 and its caller %0 have mismatched %2 attributes">;
+def err_function_always_inline_new_za : Error<
+  "always_inline function %0 has new za state">;
 
 def warn_avx_calling_convention
     : Warning<"AVX vector %select{return|argument}0 of type %1 without '%2' "

clang/lib/CodeGen/Targets/AArch64.cpp

@@ -831,6 +831,10 @@ void AArch64TargetCodeGenInfo::checkFunctionCallABI(
     llvm::SMEAttrs FAttrs;
     if (F->hasAttr<ArmLocallyStreamingAttr>())
       FAttrs.set(llvm::SMEAttrs::Mask::SM_Enabled);
+    if (auto *NewAttr = F->getAttr<ArmNewAttr>()) {
+      if (NewAttr->isNewZA())
+        FAttrs.set(llvm::SMEAttrs::Mask::ZA_New);
+    }
     if (const auto *T = F->getType()->getAs<FunctionProtoType>()) {
       if (T->getAArch64SMEAttributes() & FunctionType::SME_PStateSMEnabledMask)
         FAttrs.set(llvm::SMEAttrs::Mask::SM_Enabled);
@@ -848,6 +852,9 @@ void AArch64TargetCodeGenInfo::checkFunctionCallABI(
     CGM.getDiags().Report(CallLoc,
                           diag::err_function_always_inline_attribute_mismatch)
         << Caller->getDeclName() << Callee->getDeclName() << "streaming";
+  if (CalleeAttrs.hasNewZABody())
+    CGM.getDiags().Report(CallLoc, diag::err_function_always_inline_new_za)
+        << Callee->getDeclName();
 }
 
 std::unique_ptr<TargetCodeGenInfo>

clang/test/CodeGen/aarch64-sme-func-attrs-inline/sme-inline-new-za.c

@@ -0,0 +1,6 @@
+// RUN: %clang --target=aarch64-none-linux-gnu -march=armv9-a+sme -O3 -S -Xclang -verify %s
+
+__attribute__((always_inline)) __arm_new("za")
+void inline_new_za(void)  { }
+// expected-error@+1 {{always_inline function 'inline_new_za' has new za state}}
+void inline_caller() { inline_new_za(); }