From cca0a0ee457435f0bffb03517131ef4ef1f14fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Stojanovi=C4=87?= Date: Mon, 13 Jan 2020 19:27:03 +0100 Subject: [PATCH] [unittests] Fix "comparison of integers of different signs" warnings A warning is sent because `std::distance()` returns a signed type so `CmpHelperEQ()` gets instantiated into a function that compares differently signed arguments. Differential Revision: https://reviews.llvm.org/D72632 --- unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp | 9 ++++----- unittests/Object/MinidumpTest.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp b/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp index c1e1d9e740d..0c2d1b63ad4 100644 --- a/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp +++ b/unittests/ExecutionEngine/JITLink/LinkGraphTests.cpp @@ -56,17 +56,17 @@ TEST(LinkGraphTest, BlockAndSymbolIteration) { false, false); // Check that iteration of blocks within a section behaves as expected. - EXPECT_EQ(std::distance(Sec1.blocks().begin(), Sec1.blocks().end()), 2U); + EXPECT_EQ(std::distance(Sec1.blocks().begin(), Sec1.blocks().end()), 2); EXPECT_TRUE(llvm::count(Sec1.blocks(), &B1)); EXPECT_TRUE(llvm::count(Sec1.blocks(), &B2)); // Check that iteration of symbols within a section behaves as expected. - EXPECT_EQ(std::distance(Sec1.symbols().begin(), Sec1.symbols().end()), 2U); + EXPECT_EQ(std::distance(Sec1.symbols().begin(), Sec1.symbols().end()), 2); EXPECT_TRUE(llvm::count(Sec1.symbols(), &S1)); EXPECT_TRUE(llvm::count(Sec1.symbols(), &S2)); // Check that iteration of blocks across sections behaves as expected. - EXPECT_EQ(std::distance(G.blocks().begin(), G.blocks().end()), 4U); + EXPECT_EQ(std::distance(G.blocks().begin(), G.blocks().end()), 4); EXPECT_TRUE(llvm::count(G.blocks(), &B1)); EXPECT_TRUE(llvm::count(G.blocks(), &B2)); EXPECT_TRUE(llvm::count(G.blocks(), &B3)); @@ -75,8 +75,7 @@ TEST(LinkGraphTest, BlockAndSymbolIteration) { // Check that iteration of defined symbols across sections behaves as // expected. EXPECT_EQ( - std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), - 4U); + std::distance(G.defined_symbols().begin(), G.defined_symbols().end()), 4); EXPECT_TRUE(llvm::count(G.defined_symbols(), &S1)); EXPECT_TRUE(llvm::count(G.defined_symbols(), &S2)); EXPECT_TRUE(llvm::count(G.defined_symbols(), &S3)); diff --git a/unittests/Object/MinidumpTest.cpp b/unittests/Object/MinidumpTest.cpp index bc6d4da0bc0..85ffa79c46d 100644 --- a/unittests/Object/MinidumpTest.cpp +++ b/unittests/Object/MinidumpTest.cpp @@ -589,7 +589,7 @@ TEST(MinidumpFile, getMemoryInfoList) { const MinidumpFile &File = **ExpectedFile; auto ExpectedInfo = File.getMemoryInfoList(); ASSERT_THAT_EXPECTED(ExpectedInfo, Succeeded()); - ASSERT_EQ(1u, std::distance(ExpectedInfo->begin(), ExpectedInfo->end())); + ASSERT_EQ(1, std::distance(ExpectedInfo->begin(), ExpectedInfo->end())); const MemoryInfo &Info = *ExpectedInfo.get().begin(); EXPECT_EQ(0x0706050403020100u, Info.BaseAddress); EXPECT_EQ(0x0504030201000908u, Info.AllocationBase);