Revert "Don't use Optional::hasValue (NFC)"

This reverts commit aa8feeefd3ac6c78ee8f67bf033976fc7d68bc6d.

1 files changed, 32 insertions, 32 deletions

diff --git a/llvm/unittests/Support/KnownBitsTest.cpp b/llvm/unittests/Support/KnownBitsTest.cpp
index 1411c2e..9ef62bb 100644
--- a/llvm/unittests/Support/KnownBitsTest.cpp
+++ b/llvm/unittests/Support/KnownBitsTest.cpp
@@ -358,38 +358,38 @@ TEST(KnownBitsTest, ICmpExhaustive) {
       Optional<bool> KnownSLT = KnownBits::slt(Known1, Known2);
       Optional<bool> KnownSLE = KnownBits::sle(Known1, Known2);
 
-      EXPECT_EQ(AllEQ || NoneEQ, KnownEQ.has_value());
-      EXPECT_EQ(AllNE || NoneNE, KnownNE.has_value());
-      EXPECT_EQ(AllUGT || NoneUGT, KnownUGT.has_value());
-      EXPECT_EQ(AllUGE || NoneUGE, KnownUGE.has_value());
-      EXPECT_EQ(AllULT || NoneULT, KnownULT.has_value());
-      EXPECT_EQ(AllULE || NoneULE, KnownULE.has_value());
-      EXPECT_EQ(AllSGT || NoneSGT, KnownSGT.has_value());
-      EXPECT_EQ(AllSGE || NoneSGE, KnownSGE.has_value());
-      EXPECT_EQ(AllSLT || NoneSLT, KnownSLT.has_value());
-      EXPECT_EQ(AllSLE || NoneSLE, KnownSLE.has_value());
-
-      EXPECT_EQ(AllEQ, KnownEQ && *KnownEQ);
-      EXPECT_EQ(AllNE, KnownNE && *KnownNE);
-      EXPECT_EQ(AllUGT, KnownUGT && *KnownUGT);
-      EXPECT_EQ(AllUGE, KnownUGE && *KnownUGE);
-      EXPECT_EQ(AllULT, KnownULT && *KnownULT);
-      EXPECT_EQ(AllULE, KnownULE && *KnownULE);
-      EXPECT_EQ(AllSGT, KnownSGT && *KnownSGT);
-      EXPECT_EQ(AllSGE, KnownSGE && *KnownSGE);
-      EXPECT_EQ(AllSLT, KnownSLT && *KnownSLT);
-      EXPECT_EQ(AllSLE, KnownSLE && *KnownSLE);
-
-      EXPECT_EQ(NoneEQ, KnownEQ && !*KnownEQ);
-      EXPECT_EQ(NoneNE, KnownNE && !*KnownNE);
-      EXPECT_EQ(NoneUGT, KnownUGT && !*KnownUGT);
-      EXPECT_EQ(NoneUGE, KnownUGE && !*KnownUGE);
-      EXPECT_EQ(NoneULT, KnownULT && !*KnownULT);
-      EXPECT_EQ(NoneULE, KnownULE && !*KnownULE);
-      EXPECT_EQ(NoneSGT, KnownSGT && !*KnownSGT);
-      EXPECT_EQ(NoneSGE, KnownSGE && !*KnownSGE);
-      EXPECT_EQ(NoneSLT, KnownSLT && !*KnownSLT);
-      EXPECT_EQ(NoneSLE, KnownSLE && !*KnownSLE);
+      EXPECT_EQ(AllEQ || NoneEQ, KnownEQ.hasValue());
+      EXPECT_EQ(AllNE || NoneNE, KnownNE.hasValue());
+      EXPECT_EQ(AllUGT || NoneUGT, KnownUGT.hasValue());
+      EXPECT_EQ(AllUGE || NoneUGE, KnownUGE.hasValue());
+      EXPECT_EQ(AllULT || NoneULT, KnownULT.hasValue());
+      EXPECT_EQ(AllULE || NoneULE, KnownULE.hasValue());
+      EXPECT_EQ(AllSGT || NoneSGT, KnownSGT.hasValue());
+      EXPECT_EQ(AllSGE || NoneSGE, KnownSGE.hasValue());
+      EXPECT_EQ(AllSLT || NoneSLT, KnownSLT.hasValue());
+      EXPECT_EQ(AllSLE || NoneSLE, KnownSLE.hasValue());
+
+      EXPECT_EQ(AllEQ, KnownEQ.hasValue() && KnownEQ.getValue());
+      EXPECT_EQ(AllNE, KnownNE.hasValue() && KnownNE.getValue());
+      EXPECT_EQ(AllUGT, KnownUGT.hasValue() && KnownUGT.getValue());
+      EXPECT_EQ(AllUGE, KnownUGE.hasValue() && KnownUGE.getValue());
+      EXPECT_EQ(AllULT, KnownULT.hasValue() && KnownULT.getValue());
+      EXPECT_EQ(AllULE, KnownULE.hasValue() && KnownULE.getValue());
+      EXPECT_EQ(AllSGT, KnownSGT.hasValue() && KnownSGT.getValue());
+      EXPECT_EQ(AllSGE, KnownSGE.hasValue() && KnownSGE.getValue());
+      EXPECT_EQ(AllSLT, KnownSLT.hasValue() && KnownSLT.getValue());
+      EXPECT_EQ(AllSLE, KnownSLE.hasValue() && KnownSLE.getValue());
+
+      EXPECT_EQ(NoneEQ, KnownEQ.hasValue() && !KnownEQ.getValue());
+      EXPECT_EQ(NoneNE, KnownNE.hasValue() && !KnownNE.getValue());
+      EXPECT_EQ(NoneUGT, KnownUGT.hasValue() && !KnownUGT.getValue());
+      EXPECT_EQ(NoneUGE, KnownUGE.hasValue() && !KnownUGE.getValue());
+      EXPECT_EQ(NoneULT, KnownULT.hasValue() && !KnownULT.getValue());
+      EXPECT_EQ(NoneULE, KnownULE.hasValue() && !KnownULE.getValue());
+      EXPECT_EQ(NoneSGT, KnownSGT.hasValue() && !KnownSGT.getValue());
+      EXPECT_EQ(NoneSGE, KnownSGE.hasValue() && !KnownSGE.getValue());
+      EXPECT_EQ(NoneSLT, KnownSLT.hasValue() && !KnownSLT.getValue());
+      EXPECT_EQ(NoneSLE, KnownSLE.hasValue() && !KnownSLE.getValue());
     });
   });
 }