[clang] Fixed some warn-override tests in SemaCXX (PR #122680)

[via cfe-commits]

https://github.com/2LoS updated https://github.com/llvm/llvm-project/pull/122680

>From 3109461716e5e78b23bea7a2eb6aac3d34348612 Mon Sep 17 00:00:00 2001
From: LoS <aurumpuro at gmail.com>
Date: Mon, 13 Jan 2025 11:21:46 +0100
Subject: [PATCH 1/3] Fixed some warn-override tests in SemaCXX

---
 ...e => warn-inconsistent-missing-destructor-override.cpp} | 0
 ...uctor-override => warn-suggest-destructor-override.cpp} | 0
 .../{warn-suggest-override => warn-suggest-override.cpp}   | 7 ++++---
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename clang/test/SemaCXX/{warn-inconsistent-missing-destructor-override => warn-inconsistent-missing-destructor-override.cpp} (100%)
 rename clang/test/SemaCXX/{warn-suggest-destructor-override => warn-suggest-destructor-override.cpp} (100%)
 rename clang/test/SemaCXX/{warn-suggest-override => warn-suggest-override.cpp} (58%)

diff --git a/clang/test/SemaCXX/warn-inconsistent-missing-destructor-override b/clang/test/SemaCXX/warn-inconsistent-missing-destructor-override.cpp
similarity index 100%
rename from clang/test/SemaCXX/warn-inconsistent-missing-destructor-override
rename to clang/test/SemaCXX/warn-inconsistent-missing-destructor-override.cpp
diff --git a/clang/test/SemaCXX/warn-suggest-destructor-override b/clang/test/SemaCXX/warn-suggest-destructor-override.cpp
similarity index 100%
rename from clang/test/SemaCXX/warn-suggest-destructor-override
rename to clang/test/SemaCXX/warn-suggest-destructor-override.cpp
diff --git a/clang/test/SemaCXX/warn-suggest-override b/clang/test/SemaCXX/warn-suggest-override.cpp
similarity index 58%
rename from clang/test/SemaCXX/warn-suggest-override
rename to clang/test/SemaCXX/warn-suggest-override.cpp
index e06c939ff001fc..436a17d489693c 100644
--- a/clang/test/SemaCXX/warn-suggest-override
+++ b/clang/test/SemaCXX/warn-suggest-override.cpp
@@ -17,13 +17,13 @@ struct C {
 
 struct D : public C {
   void run();
-  // expected-warning at -1 {{'run()' overrides a member function but is not marked 'override'}}
+  // expected-warning at -1 {{'run' overrides a member function but is not marked 'override'}}
   ~D();
 };
 
 struct E : public C {
   virtual void run();
-  // expected-warning at -1 {{'run()' overrides a member function but is not marked 'override'}}
+  // expected-warning at -1 {{'run' overrides a member function but is not marked 'override'}}
   virtual ~E();
 };
 
@@ -32,7 +32,8 @@ struct F : public C {
   ~F() override;
 };
 
-struct G : public C {
+struct G : public C { // expected-note {{mark 'G' as 'final'}}
   void run() final;
   ~G() final;
+  // expected-warning at -1 {{class with destructor marked as 'final' can not be inherited from}}
 };

>From b9ef67561e235aa7d44b8cac3c46a001a08cbc75 Mon Sep 17 00:00:00 2001
From: LoS <kaffedesk at gmail.com>
Date: Mon, 13 Jan 2025 11:58:13 +0100
Subject: [PATCH 2/3] Update warn-suggest-override.cpp

---
 clang/test/SemaCXX/warn-suggest-override.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/test/SemaCXX/warn-suggest-override.cpp b/clang/test/SemaCXX/warn-suggest-override.cpp
index 436a17d489693c..b1df5cf1224cf3 100644
--- a/clang/test/SemaCXX/warn-suggest-override.cpp
+++ b/clang/test/SemaCXX/warn-suggest-override.cpp
@@ -35,5 +35,5 @@ struct F : public C {
 struct G : public C { // expected-note {{mark 'G' as 'final'}}
   void run() final;
   ~G() final;
-  // expected-warning at -1 {{class with destructor marked as 'final' can not be inherited from}}
+  // expected-warning at -1 {{class with destructor marked 'final' can not be inherited from}}
 };

>From 24d6e1ec37c8e68ff6c521a6a5e8e236e6e80757 Mon Sep 17 00:00:00 2001
From: LoS <kaffedesk at gmail.com>
Date: Mon, 13 Jan 2025 13:25:39 +0100
Subject: [PATCH 3/3] Update warn-suggest-override.cpp

---
 clang/test/SemaCXX/warn-suggest-override.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/test/SemaCXX/warn-suggest-override.cpp b/clang/test/SemaCXX/warn-suggest-override.cpp
index b1df5cf1224cf3..c4b5149c681a40 100644
--- a/clang/test/SemaCXX/warn-suggest-override.cpp
+++ b/clang/test/SemaCXX/warn-suggest-override.cpp
@@ -35,5 +35,5 @@ struct F : public C {
 struct G : public C { // expected-note {{mark 'G' as 'final'}}
   void run() final;
   ~G() final;
-  // expected-warning at -1 {{class with destructor marked 'final' can not be inherited from}}
+  // expected-warning at -1 {{class with destructor marked 'final' cannot be inherited from}}
 };