[clang] Revert "[Clang] Demote always_inline error to warning for mismatching SME attrs" (PR #100991)

[Sander de Smalen via cfe-commits]

https://github.com/sdesmalen-arm created 
https://github.com/llvm/llvm-project/pull/100991
Reverts llvm/llvm-project#100740

>From e3e9cde46626ff525442b21963c03675c6bfa368 Mon Sep 17 00:00:00 2001
From: Sander de Smalen <sander.desma...@arm.com>
Date: Mon, 29 Jul 2024 10:18:27 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"[Clang]=20Demote=20always=5Finline=20?=
 =?UTF-8?q?error=20to=20warning=20for=20mismatching=20SME=20att=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5430f73b501f9fc0a38c3768592f5f31bcbdf2f0.
---
 clang/include/clang/Basic/DiagnosticFrontendKinds.td    | 3 ---
 clang/lib/CodeGen/Targets/AArch64.cpp                   | 6 ++----
 clang/test/CodeGen/aarch64-sme-inline-streaming-attrs.c | 6 +++---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td 
b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
index 8a1462c670d68..12a4617c64d87 100644
--- a/clang/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/clang/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -288,9 +288,6 @@ def err_function_needs_feature : Error<
 let CategoryName = "Codegen ABI Check" in {
 def err_function_always_inline_attribute_mismatch : Error<
   "always_inline function %1 and its caller %0 have mismatching %2 
attributes">;
-def warn_function_always_inline_attribute_mismatch : Warning<
-  "always_inline function %1 and its caller %0 have mismatching %2 attributes, 
"
-  "inlining may change runtime behaviour">, InGroup<AArch64SMEAttributes>;
 def err_function_always_inline_new_za : Error<
   "always_inline function %0 has new za state">;
 
diff --git a/clang/lib/CodeGen/Targets/AArch64.cpp 
b/clang/lib/CodeGen/Targets/AArch64.cpp
index 1dec3cd40ebd2..b9df54b0c67c4 100644
--- a/clang/lib/CodeGen/Targets/AArch64.cpp
+++ b/clang/lib/CodeGen/Targets/AArch64.cpp
@@ -883,10 +883,8 @@ void 
AArch64TargetCodeGenInfo::checkFunctionCallABIStreaming(
 
   if (!CalleeIsStreamingCompatible &&
       (CallerIsStreaming != CalleeIsStreaming || CallerIsStreamingCompatible))
-    CGM.getDiags().Report(
-        CallLoc, CalleeIsStreaming
-                     ? diag::err_function_always_inline_attribute_mismatch
-                     : diag::warn_function_always_inline_attribute_mismatch)
+    CGM.getDiags().Report(CallLoc,
+                          diag::err_function_always_inline_attribute_mismatch)
         << Caller->getDeclName() << Callee->getDeclName() << "streaming";
   if (auto *NewAttr = Callee->getAttr<ArmNewAttr>())
     if (NewAttr->isNewZA())
diff --git a/clang/test/CodeGen/aarch64-sme-inline-streaming-attrs.c 
b/clang/test/CodeGen/aarch64-sme-inline-streaming-attrs.c
index 98370a888ac6c..25aebeced9379 100644
--- a/clang/test/CodeGen/aarch64-sme-inline-streaming-attrs.c
+++ b/clang/test/CodeGen/aarch64-sme-inline-streaming-attrs.c
@@ -20,7 +20,7 @@ void caller(void) {
 
 #ifdef TEST_COMPATIBLE
 void caller_compatible(void) __arm_streaming_compatible {
-    inlined_fn(); // expected-warning {{always_inline function 'inlined_fn' 
and its caller 'caller_compatible' have mismatching streaming attributes, 
inlining may change runtime behaviour}}
+    inlined_fn(); // expected-error {{always_inline function 'inlined_fn' and 
its caller 'caller_compatible' have mismatching streaming attributes}}
     inlined_fn_streaming_compatible();
     inlined_fn_streaming(); // expected-error {{always_inline function 
'inlined_fn_streaming' and its caller 'caller_compatible' have mismatching 
streaming attributes}}
     inlined_fn_local(); // expected-error {{always_inline function 
'inlined_fn_local' and its caller 'caller_compatible' have mismatching 
streaming attributes}}
@@ -29,7 +29,7 @@ void caller_compatible(void) __arm_streaming_compatible {
 
 #ifdef TEST_STREAMING
 void caller_streaming(void) __arm_streaming {
-    inlined_fn(); // expected-warning {{always_inline function 'inlined_fn' 
and its caller 'caller_streaming' have mismatching streaming attributes, 
inlining may change runtime behaviour}}
+    inlined_fn(); // expected-error {{always_inline function 'inlined_fn' and 
its caller 'caller_streaming' have mismatching streaming attributes}}
     inlined_fn_streaming_compatible();
     inlined_fn_streaming();
     inlined_fn_local();
@@ -39,7 +39,7 @@ void caller_streaming(void) __arm_streaming {
 #ifdef TEST_LOCALLY
 __arm_locally_streaming
 void caller_local(void) {
-    inlined_fn(); // expected-warning {{always_inline function 'inlined_fn' 
and its caller 'caller_local' have mismatching streaming attributes, inlining 
may change runtime behaviour}}
+    inlined_fn(); // expected-error {{always_inline function 'inlined_fn' and 
its caller 'caller_local' have mismatching streaming attributes}}
     inlined_fn_streaming_compatible();
     inlined_fn_streaming();
     inlined_fn_local();

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits