Author: Jie Fu Date: 2023-02-10T10:51:21+08:00 New Revision: 35537aea1228df29c4e32049e4750029c5f0693b
URL: https://github.com/llvm/llvm-project/commit/35537aea1228df29c4e32049e4750029c5f0693b DIFF: https://github.com/llvm/llvm-project/commit/35537aea1228df29c4e32049e4750029c5f0693b.diff LOG: [Modules][Test][NFC] Fix -Wsign-compare in clang/unittests/Lex/ModuleDeclStateTest.cpp In file included from /data/jiefu/llvm-project/clang/unittests/Lex/ModuleDeclStateTest.cpp:22: /data/jiefu/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h:1526:11: error: comparison of integers of different signs: 'const unsigned long' and 'const int' [-Werror,-Wsign-compare] if (lhs == rhs) { ~~~ ^ ~~~ /data/jiefu/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h:1553:12: note: in instantiation of function template specialization 'testing::internal::CmpHelperEQ<unsigned long, int>' requested here return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs); ^ /data/jiefu/llvm-project/clang/unittests/Lex/ModuleDeclStateTest.cpp:124:3: note: in instantiation of function template specialization 'testing::internal::EqHelper::Compare<unsigned long, int, nullptr>' requested here EXPECT_EQ(Callback->importNamedModuleNum(), 0); ^ /data/jiefu/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h:2027:54: note: expanded from macro 'EXPECT_EQ' EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2) ^ 1 error generated. Added: Modified: clang/unittests/Lex/ModuleDeclStateTest.cpp Removed: ################################################################################ diff --git a/clang/unittests/Lex/ModuleDeclStateTest.cpp b/clang/unittests/Lex/ModuleDeclStateTest.cpp index a8695391556f5..246d653a6c73a 100644 --- a/clang/unittests/Lex/ModuleDeclStateTest.cpp +++ b/clang/unittests/Lex/ModuleDeclStateTest.cpp @@ -121,7 +121,7 @@ export module foo; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 0); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)0); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_TRUE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -140,7 +140,7 @@ module foo; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 0); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)0); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_FALSE(PP->isInNamedInterfaceUnit()); EXPECT_TRUE(PP->isInImplementationUnit()); @@ -159,7 +159,7 @@ module foo:part; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 0); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)0); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_FALSE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -178,7 +178,7 @@ export module foo:part; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 0); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)0); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_TRUE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -197,7 +197,7 @@ export module foo.dot:part.dot; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 0); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)0); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_TRUE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -216,7 +216,7 @@ TEST_F(ModuleDeclStateTest, NotModule) { auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 0); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)0); EXPECT_FALSE(PP->isInNamedModule()); EXPECT_FALSE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -242,7 +242,7 @@ import :another; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 2); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)2); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_TRUE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -269,7 +269,7 @@ import :another; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 2); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)2); EXPECT_TRUE(PP->isInNamedModule()); EXPECT_TRUE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -295,7 +295,7 @@ import :another; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 1); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)1); EXPECT_FALSE(PP->isInNamedModule()); EXPECT_FALSE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -315,7 +315,7 @@ TEST_F(ModuleDeclStateTest, ImportAClangNamedModule) { auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 1); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)1); EXPECT_FALSE(PP->isInNamedModule()); EXPECT_FALSE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); @@ -339,7 +339,7 @@ import M2; auto *Callback = static_cast<CheckNamedModuleImportingCB *>(PP->getPPCallbacks()); - EXPECT_EQ(Callback->importNamedModuleNum(), 4); + EXPECT_EQ(Callback->importNamedModuleNum(), (size_t)4); EXPECT_FALSE(PP->isInNamedModule()); EXPECT_FALSE(PP->isInNamedInterfaceUnit()); EXPECT_FALSE(PP->isInImplementationUnit()); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
