https://github.com/jansvoboda11 updated
https://github.com/llvm/llvm-project/pull/68157
>From d015b32b5a48c84a94b6a34138f809caf94ed456 Mon Sep 17 00:00:00 2001
From: Jan Svoboda <jan_svob...@apple.com>
Date: Tue, 3 Oct 2023 13:40:07 -0700
Subject: [PATCH 1/3] [clang] NFC: Deprecate `FileEntry::getName()`
---
clang/include/clang/Basic/FileEntry.h | 1 +
clang/unittests/Basic/FileManagerTest.cpp | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/clang/include/clang/Basic/FileEntry.h
b/clang/include/clang/Basic/FileEntry.h
index bc65463735488..6351aeae92e2c 100644
--- a/clang/include/clang/Basic/FileEntry.h
+++ b/clang/include/clang/Basic/FileEntry.h
@@ -394,6 +394,7 @@ class FileEntry {
public:
~FileEntry();
+ LLVM_DEPRECATED("Use FileEntryRef::getName() instead.", "")
StringRef getName() const { return LastRef->getName(); }
StringRef tryGetRealPathName() const { return RealPathName; }
diff --git a/clang/unittests/Basic/FileManagerTest.cpp
b/clang/unittests/Basic/FileManagerTest.cpp
index bf30fabb7cd88..d32036d975ce9 100644
--- a/clang/unittests/Basic/FileManagerTest.cpp
+++ b/clang/unittests/Basic/FileManagerTest.cpp
@@ -284,7 +284,6 @@ TEST_F(FileManagerTest,
getFileRefReturnsCorrectNameForDifferentStatPath) {
ASSERT_FALSE(!F1Alias);
ASSERT_FALSE(!F1Alias2);
EXPECT_EQ("dir/f1.cpp", F1->getName());
- EXPECT_EQ("dir/f1.cpp", F1->getFileEntry().getName());
EXPECT_EQ("dir/f1.cpp", F1Alias->getName());
EXPECT_EQ("dir/f1.cpp", F1Alias2->getName());
EXPECT_EQ(&F1->getFileEntry(), &F1Alias->getFileEntry());
@@ -303,7 +302,6 @@ TEST_F(FileManagerTest,
getFileRefReturnsCorrectNameForDifferentStatPath) {
ASSERT_FALSE(!F2Alias);
ASSERT_FALSE(!F2Alias2);
EXPECT_EQ("dir/f2.cpp", F2->getName());
- EXPECT_EQ("dir/f2.cpp", F2->getFileEntry().getName());
EXPECT_EQ("dir/f2.cpp", F2Alias->getName());
EXPECT_EQ("dir/f2.cpp", F2Alias2->getName());
EXPECT_EQ(&F2->getFileEntry(), &F2Alias->getFileEntry());
>From 42371d4ae0f4f4309da637a3b45c19e4b81f0b03 Mon Sep 17 00:00:00 2001
From: Jan Svoboda <jan_svob...@apple.com>
Date: Mon, 4 Dec 2023 11:55:07 -0800
Subject: [PATCH 2/3] [clang] Keep testing `getName()`, disable deprecation
warnings
---
clang/unittests/Basic/FileManagerTest.cpp | 6 ++++++
llvm/include/llvm/Support/Compiler.h | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/clang/unittests/Basic/FileManagerTest.cpp
b/clang/unittests/Basic/FileManagerTest.cpp
index d32036d975ce9..9de8b72bf5a78 100644
--- a/clang/unittests/Basic/FileManagerTest.cpp
+++ b/clang/unittests/Basic/FileManagerTest.cpp
@@ -284,6 +284,9 @@ TEST_F(FileManagerTest,
getFileRefReturnsCorrectNameForDifferentStatPath) {
ASSERT_FALSE(!F1Alias);
ASSERT_FALSE(!F1Alias2);
EXPECT_EQ("dir/f1.cpp", F1->getName());
+ LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
+ EXPECT_EQ("dir/f1.cpp", F1->getFileEntry().getName());
+ LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
EXPECT_EQ("dir/f1.cpp", F1Alias->getName());
EXPECT_EQ("dir/f1.cpp", F1Alias2->getName());
EXPECT_EQ(&F1->getFileEntry(), &F1Alias->getFileEntry());
@@ -302,6 +305,9 @@ TEST_F(FileManagerTest,
getFileRefReturnsCorrectNameForDifferentStatPath) {
ASSERT_FALSE(!F2Alias);
ASSERT_FALSE(!F2Alias2);
EXPECT_EQ("dir/f2.cpp", F2->getName());
+ LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
+ EXPECT_EQ("dir/f2.cpp", F2->getFileEntry().getName());
+ LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
EXPECT_EQ("dir/f2.cpp", F2Alias->getName());
EXPECT_EQ("dir/f2.cpp", F2Alias2->getName());
EXPECT_EQ(&F2->getFileEntry(), &F2Alias->getFileEntry());
diff --git a/llvm/include/llvm/Support/Compiler.h
b/llvm/include/llvm/Support/Compiler.h
index 6b13952bb2f41..26a46a279e7b2 100644
--- a/llvm/include/llvm/Support/Compiler.h
+++ b/llvm/include/llvm/Support/Compiler.h
@@ -157,6 +157,25 @@
#define LLVM_DEPRECATED(MSG, FIX) [[deprecated(MSG)]]
#endif
+// clang-format off
+#if defined(__clang__) || defined(__GNUC__)
+#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
\
+ _Pragma("GCC diagnostic push")
\
+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
\
+ _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
\
+ _Pragma("warning(push)")
\
+ _Pragma("warning(disable : 4996)")
+#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
\
+ _Pragma("warning(pop)")
+#else
+#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
+#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
+#endif
+// clang-format on
+
// Indicate that a non-static, non-const C++ member function reinitializes
// the entire object to a known state, independent of the previous state of
// the object.
>From b49befaf63752c603bd7678190e58ca95def9727 Mon Sep 17 00:00:00 2001
From: Jan Svoboda <jan_svob...@apple.com>
Date: Wed, 6 Dec 2023 09:35:01 -0800
Subject: [PATCH 3/3] [clang] Rename deprecation-supressing macro
---
clang/unittests/Basic/FileManagerTest.cpp | 8 ++++----
llvm/include/llvm/Support/Compiler.h | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/clang/unittests/Basic/FileManagerTest.cpp
b/clang/unittests/Basic/FileManagerTest.cpp
index 9de8b72bf5a78..43339676c4a6a 100644
--- a/clang/unittests/Basic/FileManagerTest.cpp
+++ b/clang/unittests/Basic/FileManagerTest.cpp
@@ -284,9 +284,9 @@ TEST_F(FileManagerTest,
getFileRefReturnsCorrectNameForDifferentStatPath) {
ASSERT_FALSE(!F1Alias);
ASSERT_FALSE(!F1Alias2);
EXPECT_EQ("dir/f1.cpp", F1->getName());
- LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
+ LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
EXPECT_EQ("dir/f1.cpp", F1->getFileEntry().getName());
- LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
+ LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
EXPECT_EQ("dir/f1.cpp", F1Alias->getName());
EXPECT_EQ("dir/f1.cpp", F1Alias2->getName());
EXPECT_EQ(&F1->getFileEntry(), &F1Alias->getFileEntry());
@@ -305,9 +305,9 @@ TEST_F(FileManagerTest,
getFileRefReturnsCorrectNameForDifferentStatPath) {
ASSERT_FALSE(!F2Alias);
ASSERT_FALSE(!F2Alias2);
EXPECT_EQ("dir/f2.cpp", F2->getName());
- LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
+ LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
EXPECT_EQ("dir/f2.cpp", F2->getFileEntry().getName());
- LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
+ LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
EXPECT_EQ("dir/f2.cpp", F2Alias->getName());
EXPECT_EQ("dir/f2.cpp", F2Alias2->getName());
EXPECT_EQ(&F2->getFileEntry(), &F2Alias->getFileEntry());
diff --git a/llvm/include/llvm/Support/Compiler.h
b/llvm/include/llvm/Support/Compiler.h
index 26a46a279e7b2..8c315d255bb77 100644
--- a/llvm/include/llvm/Support/Compiler.h
+++ b/llvm/include/llvm/Support/Compiler.h
@@ -159,20 +159,20 @@
// clang-format off
#if defined(__clang__) || defined(__GNUC__)
-#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
\
+#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
\
_Pragma("GCC diagnostic push")
\
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
\
+#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
\
_Pragma("GCC diagnostic pop")
#elif defined(_MSC_VER)
-#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
\
+#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
\
_Pragma("warning(push)")
\
_Pragma("warning(disable : 4996)")
-#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
\
+#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
\
_Pragma("warning(pop)")
#else
-#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
-#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
+#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_PUSH
+#define LLVM_SUPPRESS_DEPRECATED_DECLARATIONS_POP
#endif
// clang-format on
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
