[clang] Use value instead of getValue (NFC)

3 files changed, 54 insertions, 56 deletions

diff --git a/clang/unittests/Analysis/MacroExpansionContextTest.cpp b/clang/unittests/Analysis/MacroExpansionContextTest.cpp
index 2f28c59..add3099 100644
--- a/clang/unittests/Analysis/MacroExpansionContextTest.cpp
+++ b/clang/unittests/Analysis/MacroExpansionContextTest.cpp
@@ -181,14 +181,14 @@ EMPTY zz
   //  A b cd ef gh
   //      zz
 
-  EXPECT_EQ("", Ctx->getExpandedText(at(3, 10)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(3, 10)).getValue());
+  EXPECT_EQ("", Ctx->getExpandedText(at(3, 10)).value());
+  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(3, 10)).value());
 
-  EXPECT_EQ("", Ctx->getExpandedText(at(3, 19)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(3, 19)).getValue());
+  EXPECT_EQ("", Ctx->getExpandedText(at(3, 19)).value());
+  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(3, 19)).value());
 
-  EXPECT_EQ("", Ctx->getExpandedText(at(4, 1)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 1)).getValue());
+  EXPECT_EQ("", Ctx->getExpandedText(at(4, 1)).value());
+  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 1)).value());
 }
 
 TEST_F(MacroExpansionContextTest, TransitiveExpansions) {
@@ -200,10 +200,10 @@ TEST_F(MacroExpansionContextTest, TransitiveExpansions) {
   // After preprocessing:
   //  A b cd ) 1 ef gh
 
-  EXPECT_EQ("WOOF", Ctx->getOriginalText(at(4, 10)).getValue());
+  EXPECT_EQ("WOOF", Ctx->getOriginalText(at(4, 10)).value());
 
-  EXPECT_EQ("", Ctx->getExpandedText(at(4, 18)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 18)).getValue());
+  EXPECT_EQ("", Ctx->getExpandedText(at(4, 18)).value());
+  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 18)).value());
 }
 
 TEST_F(MacroExpansionContextTest, MacroFunctions) {
@@ -219,17 +219,17 @@ TEST_F(MacroExpansionContextTest, MacroFunctions) {
   //  WOOF( ) ) ) 1
   //  bar barr( ) ) ) 1( ) ) ) 1),,),')
 
-  EXPECT_EQ("$$ ef ()))1", Ctx->getExpandedText(at(4, 10)).getValue());
-  EXPECT_EQ("WOOF($$ ef)", Ctx->getOriginalText(at(4, 10)).getValue());
+  EXPECT_EQ("$$ ef ()))1", Ctx->getExpandedText(at(4, 10)).value());
+  EXPECT_EQ("WOOF($$ ef)", Ctx->getOriginalText(at(4, 10)).value());
 
-  EXPECT_EQ("", Ctx->getExpandedText(at(4, 22)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 22)).getValue());
+  EXPECT_EQ("", Ctx->getExpandedText(at(4, 22)).value());
+  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 22)).value());
 
-  EXPECT_EQ("WOOF ()))1", Ctx->getExpandedText(at(5, 3)).getValue());
-  EXPECT_EQ("WOOF(WOOF)", Ctx->getOriginalText(at(5, 3)).getValue());
+  EXPECT_EQ("WOOF ()))1", Ctx->getExpandedText(at(5, 3)).value());
+  EXPECT_EQ("WOOF(WOOF)", Ctx->getOriginalText(at(5, 3)).value());
 
-  EXPECT_EQ("bar barr ()))1()))1", Ctx->getExpandedText(at(6, 3)).getValue());
-  EXPECT_EQ("WOOF(WOOF(bar barr))", Ctx->getOriginalText(at(6, 3)).getValue());
+  EXPECT_EQ("bar barr ()))1()))1", Ctx->getExpandedText(at(6, 3)).value());
+  EXPECT_EQ("WOOF(WOOF(bar barr))", Ctx->getOriginalText(at(6, 3)).value());
 }
 
 TEST_F(MacroExpansionContextTest, VariadicMacros) {
@@ -251,24 +251,23 @@ TEST_F(MacroExpansionContextTest, VariadicMacros) {
   //  fprintf (stderr, "success!\n" );
 
   EXPECT_EQ(R"(fprintf (stderr ,"success!\n",))",
-            Ctx->getExpandedText(at(3, 3)).getValue());
+            Ctx->getExpandedText(at(3, 3)).value());
   EXPECT_EQ(R"(eprintf("success!\n", ))",
-            Ctx->getOriginalText(at(3, 3)).getValue());
+            Ctx->getOriginalText(at(3, 3)).value());
 
   EXPECT_EQ(R"(fprintf (stderr ,"success!\n",))",
-            Ctx->getExpandedText(at(4, 3)).getValue());
-  EXPECT_EQ(R"(eprintf("success!\n"))",
-            Ctx->getOriginalText(at(4, 3)).getValue());
+            Ctx->getExpandedText(at(4, 3)).value());
+  EXPECT_EQ(R"(eprintf("success!\n"))", Ctx->getOriginalText(at(4, 3)).value());
 
   EXPECT_EQ(R"(fprintf (stderr ,"success!\n"))",
-            Ctx->getExpandedText(at(8, 3)).getValue());
+            Ctx->getExpandedText(at(8, 3)).value());
   EXPECT_EQ(R"(eprintf2("success!\n", ))",
-            Ctx->getOriginalText(at(8, 3)).getValue());
+            Ctx->getOriginalText(at(8, 3)).value());
 
   EXPECT_EQ(R"(fprintf (stderr ,"success!\n"))",
-            Ctx->getExpandedText(at(9, 3)).getValue());
+            Ctx->getExpandedText(at(9, 3)).value());
   EXPECT_EQ(R"(eprintf2("success!\n"))",
-            Ctx->getOriginalText(at(9, 3)).getValue());
+            Ctx->getOriginalText(at(9, 3)).value());
 }
 
 TEST_F(MacroExpansionContextTest, ConcatenationMacros) {
@@ -286,12 +285,12 @@ TEST_F(MacroExpansionContextTest, ConcatenationMacros) {
   //  };
 
   EXPECT_EQ(R"({"quit",quit_command })",
-            Ctx->getExpandedText(at(4, 5)).getValue());
-  EXPECT_EQ("COMMAND(quit)", Ctx->getOriginalText(at(4, 5)).getValue());
+            Ctx->getExpandedText(at(4, 5)).value());
+  EXPECT_EQ("COMMAND(quit)", Ctx->getOriginalText(at(4, 5)).value());
 
   EXPECT_EQ(R"({"help",help_command })",
-            Ctx->getExpandedText(at(5, 5)).getValue());
-  EXPECT_EQ("COMMAND(help)", Ctx->getOriginalText(at(5, 5)).getValue());
+            Ctx->getExpandedText(at(5, 5)).value());
+  EXPECT_EQ("COMMAND(help)", Ctx->getOriginalText(at(5, 5)).value());
 }
 
 TEST_F(MacroExpansionContextTest, StringizingMacros) {
@@ -316,14 +315,14 @@ TEST_F(MacroExpansionContextTest, StringizingMacros) {
 
   EXPECT_EQ(
       R"(do {if (x ==0)fprintf (stderr ,"Warning: ""x == 0""\n");}while (0))",
-      Ctx->getExpandedText(at(6, 3)).getValue());
-  EXPECT_EQ("WARN_IF (x == 0)", Ctx->getOriginalText(at(6, 3)).getValue());
+      Ctx->getExpandedText(at(6, 3)).value());
+  EXPECT_EQ("WARN_IF (x == 0)", Ctx->getOriginalText(at(6, 3)).value());
 
-  EXPECT_EQ(R"("foo")", Ctx->getExpandedText(at(11, 3)).getValue());
-  EXPECT_EQ("str (foo)", Ctx->getOriginalText(at(11, 3)).getValue());
+  EXPECT_EQ(R"("foo")", Ctx->getExpandedText(at(11, 3)).value());
+  EXPECT_EQ("str (foo)", Ctx->getOriginalText(at(11, 3)).value());
 
-  EXPECT_EQ(R"("4")", Ctx->getExpandedText(at(12, 3)).getValue());
-  EXPECT_EQ("xstr (foo)", Ctx->getOriginalText(at(12, 3)).getValue());
+  EXPECT_EQ(R"("4")", Ctx->getExpandedText(at(12, 3)).value());
+  EXPECT_EQ("xstr (foo)", Ctx->getOriginalText(at(12, 3)).value());
 }
 
 TEST_F(MacroExpansionContextTest, StringizingVariadicMacros) {
@@ -352,18 +351,18 @@ TEST_F(MacroExpansionContextTest, StringizingVariadicMacros) {
 
   EXPECT_EQ("zz !apple !x *apple !x !**y (apple )zz !apple !x *apple !x !**y "
             "(appleapple ))))",
-            Ctx->getExpandedText(at(11, 3)).getValue());
-  EXPECT_EQ("q(g)", Ctx->getOriginalText(at(11, 3)).getValue());
+            Ctx->getExpandedText(at(11, 3)).value());
+  EXPECT_EQ("q(g)", Ctx->getOriginalText(at(11, 3)).value());
 
   EXPECT_EQ(R"res("apple"(apple )"apple"(appleapple )))))res",
-            Ctx->getExpandedText(at(12, 3)).getValue());
-  EXPECT_EQ("q(xstr)", Ctx->getOriginalText(at(12, 3)).getValue());
+            Ctx->getExpandedText(at(12, 3)).value());
+  EXPECT_EQ("q(xstr)", Ctx->getOriginalText(at(12, 3)).value());
 
-  EXPECT_EQ("zz !*)!x )!**y ", Ctx->getExpandedText(at(13, 3)).getValue());
-  EXPECT_EQ("g(RParen2x)", Ctx->getOriginalText(at(13, 3)).getValue());
+  EXPECT_EQ("zz !*)!x )!**y ", Ctx->getExpandedText(at(13, 3)).value());
+  EXPECT_EQ("g(RParen2x)", Ctx->getOriginalText(at(13, 3)).value());
 
-  EXPECT_EQ("!))*))", Ctx->getExpandedText(at(14, 3)).getValue());
-  EXPECT_EQ("f( RParen2x )", Ctx->getOriginalText(at(14, 3)).getValue());
+  EXPECT_EQ("!))*))", Ctx->getExpandedText(at(14, 3)).value());
+  EXPECT_EQ("f( RParen2x )", Ctx->getOriginalText(at(14, 3)).value());
 }
 
 TEST_F(MacroExpansionContextTest, RedefUndef) {
@@ -381,11 +380,11 @@ TEST_F(MacroExpansionContextTest, RedefUndef) {
   //  Hi(Hi)
 
   // FIXME: Extra space follows every identifier.
-  EXPECT_EQ("Welcome Adam ", Ctx->getExpandedText(at(3, 3)).getValue());
-  EXPECT_EQ("Hi(Adam)", Ctx->getOriginalText(at(3, 3)).getValue());
+  EXPECT_EQ("Welcome Adam ", Ctx->getExpandedText(at(3, 3)).value());
+  EXPECT_EQ("Hi(Adam)", Ctx->getOriginalText(at(3, 3)).value());
 
-  EXPECT_EQ("Willkommen ", Ctx->getExpandedText(at(5, 3)).getValue());
-  EXPECT_EQ("Hi", Ctx->getOriginalText(at(5, 3)).getValue());
+  EXPECT_EQ("Willkommen ", Ctx->getExpandedText(at(5, 3)).value());
+  EXPECT_EQ("Hi", Ctx->getOriginalText(at(5, 3)).value());
 
   // There was no macro expansion at 7:3, we should expect None.
   EXPECT_FALSE(Ctx->getExpandedText(at(7, 3)).has_value());
@@ -411,12 +410,11 @@ TEST_F(MacroExpansionContextTest, UnbalacedParenthesis) {
   //  fun();
   //  int x = ((1, fun(), 1, fun(), 1 ));
 
-  EXPECT_EQ("fun ()", Ctx->getExpandedText(at(8, 3)).getValue());
-  EXPECT_EQ("applyInt )", Ctx->getOriginalText(at(8, 3)).getValue());
+  EXPECT_EQ("fun ()", Ctx->getExpandedText(at(8, 3)).value());
+  EXPECT_EQ("applyInt )", Ctx->getOriginalText(at(8, 3)).value());
 
-  EXPECT_EQ("((1,fun (),1,fun (),1",
-            Ctx->getExpandedText(at(13, 12)).getValue());
-  EXPECT_EQ("f(f(1))", Ctx->getOriginalText(at(13, 12)).getValue());
+  EXPECT_EQ("((1,fun (),1,fun (),1", Ctx->getExpandedText(at(13, 12)).value());
+  EXPECT_EQ("f(f(1))", Ctx->getOriginalText(at(13, 12)).value());
 }
 
 } // namespace
diff --git a/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp b/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
index 13c9ed9..3a73f39 100644
--- a/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
+++ b/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
@@ -262,7 +262,7 @@ void checkEventualResultWithTimeout(VerifyingConsumer &TestConsumer) {
   if (TestConsumer.result()) {
     EXPECT_TRUE(*TestConsumer.result());
   }
-  if ((TestConsumer.result() && !TestConsumer.result().getValue()) ||
+  if ((TestConsumer.result() && !TestConsumer.result().value()) ||
       !TestConsumer.result())
     TestConsumer.printUnmetExpectations(llvm::outs());
 }
diff --git a/clang/unittests/Lex/HeaderSearchTest.cpp b/clang/unittests/Lex/HeaderSearchTest.cpp
index 93b4512..5024f0d 100644
--- a/clang/unittests/Lex/HeaderSearchTest.cpp
+++ b/clang/unittests/Lex/HeaderSearchTest.cpp
@@ -202,7 +202,7 @@ TEST_F(HeaderSearchTest, HeaderFrameworkLookup) {
 
   EXPECT_TRUE(FoundFile.has_value());
   EXPECT_TRUE(IsFrameworkFound);
-  auto &FE = FoundFile.getValue();
+  auto &FE = FoundFile.value();
   auto FI = Search.getExistingFileInfo(FE);
   EXPECT_TRUE(FI);
   EXPECT_TRUE(FI->IsValid);
@@ -271,7 +271,7 @@ TEST_F(HeaderSearchTest, HeaderMapFrameworkLookup) {
 
   EXPECT_TRUE(FoundFile.has_value());
   EXPECT_TRUE(IsMapped);
-  auto &FE = FoundFile.getValue();
+  auto &FE = FoundFile.value();
   auto FI = Search.getExistingFileInfo(FE);
   EXPECT_TRUE(FI);
   EXPECT_TRUE(FI->IsValid);