Skip to content

Commit 42371d4

Browse files
committed
[clang] Keep testing getName(), disable deprecation warnings
1 parent d015b32 commit 42371d4

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

clang/unittests/Basic/FileManagerTest.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ TEST_F(FileManagerTest, getFileRefReturnsCorrectNameForDifferentStatPath) {
284284
ASSERT_FALSE(!F1Alias);
285285
ASSERT_FALSE(!F1Alias2);
286286
EXPECT_EQ("dir/f1.cpp", F1->getName());
287+
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
288+
EXPECT_EQ("dir/f1.cpp", F1->getFileEntry().getName());
289+
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
287290
EXPECT_EQ("dir/f1.cpp", F1Alias->getName());
288291
EXPECT_EQ("dir/f1.cpp", F1Alias2->getName());
289292
EXPECT_EQ(&F1->getFileEntry(), &F1Alias->getFileEntry());
@@ -302,6 +305,9 @@ TEST_F(FileManagerTest, getFileRefReturnsCorrectNameForDifferentStatPath) {
302305
ASSERT_FALSE(!F2Alias);
303306
ASSERT_FALSE(!F2Alias2);
304307
EXPECT_EQ("dir/f2.cpp", F2->getName());
308+
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
309+
EXPECT_EQ("dir/f2.cpp", F2->getFileEntry().getName());
310+
LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
305311
EXPECT_EQ("dir/f2.cpp", F2Alias->getName());
306312
EXPECT_EQ("dir/f2.cpp", F2Alias2->getName());
307313
EXPECT_EQ(&F2->getFileEntry(), &F2Alias->getFileEntry());

llvm/include/llvm/Support/Compiler.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,25 @@
157157
#define LLVM_DEPRECATED(MSG, FIX) [[deprecated(MSG)]]
158158
#endif
159159

160+
// clang-format off
161+
#if defined(__clang__) || defined(__GNUC__)
162+
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN \
163+
_Pragma("GCC diagnostic push") \
164+
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
165+
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END \
166+
_Pragma("GCC diagnostic pop")
167+
#elif defined(_MSC_VER)
168+
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN \
169+
_Pragma("warning(push)") \
170+
_Pragma("warning(disable : 4996)")
171+
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END \
172+
_Pragma("warning(pop)")
173+
#else
174+
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_BEGIN
175+
#define LLVM_IGNORE_DEPRECATIONS_OF_DECLARATIONS_END
176+
#endif
177+
// clang-format on
178+
160179
// Indicate that a non-static, non-const C++ member function reinitializes
161180
// the entire object to a known state, independent of the previous state of
162181
// the object.

0 commit comments

Comments
 (0)