Fix warnings in ImmutableSetTest and SequenceTest.

Doing "I++" inside of an EXPECT_* triggers

  warning: expression with side effects has no effect in an unevaluated context

because EXPECT_* partially expands to

  EqHelper<(sizeof(::testing::internal::IsNullLiteralHelper(i++)) == 1)>

which is an unevaluated context.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@275717 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/ADT/ImmutableSetTest.cpp b/unittests/ADT/ImmutableSetTest.cpp
index febd441db166382ac6ff69305ff84b2dec640f0e..a6eb405db7203feb4b4eab83314410636e83a899 100644 (file)
--- a/unittests/ADT/ImmutableSetTest.cpp
+++ b/unittests/ADT/ImmutableSetTest.cpp
@@ -181,19 +181,22 @@ TEST_F(ImmutableSetTest, IterLongSetTest) {
 
   int i = 0;
   for (ImmutableSet<long>::iterator I = S.begin(), E = S.end(); I != E; ++I) {
-    ASSERT_EQ(i++, *I);
+    ASSERT_EQ(i, *I);
+    i++;
   }
   ASSERT_EQ(0, i);
 
   i = 0;
   for (ImmutableSet<long>::iterator I = S2.begin(), E = S2.end(); I != E; ++I) {
-    ASSERT_EQ(i++, *I);
+    ASSERT_EQ(i, *I);
+    i++;
   }
   ASSERT_EQ(3, i);
 
   i = 0;
   for (ImmutableSet<long>::iterator I = S3.begin(), E = S3.end(); I != E; I++) {
-    ASSERT_EQ(i++, *I);
+    ASSERT_EQ(i, *I);
+    i++;
   }
   ASSERT_EQ(6, i);
 }

diff --git a/unittests/ADT/SequenceTest.cpp b/unittests/ADT/SequenceTest.cpp
index d82c3c2d4ef52e7121df643bd0f48e48dd586595..cc82f86c30d5601c60d2b8676a767cfe6488d17e 100644 (file)
--- a/unittests/ADT/SequenceTest.cpp
+++ b/unittests/ADT/SequenceTest.cpp
@@ -18,8 +18,10 @@ namespace {
 
 TEST(SequenceTest, Basic) {
   int x = 0;
-  for (int i : seq(0, 10))
-    EXPECT_EQ(x++, i);
+  for (int i : seq(0, 10)) {
+    EXPECT_EQ(x, i);
+    x++;
+  }
   EXPECT_EQ(10, x);
 
   auto my_seq = seq(0, 4);