--- a/clang/unittests/Lex/PPDependencyDirectivesTest.cpp	Wed Nov 09 17:47:54 2022 +0900
+++ b/clang/unittests/Lex/PPDependencyDirectivesTest.cpp	Fri Aug 18 09:04:13 2023 +0900
@@ -21,6 +21,7 @@
 #include "clang/Lex/PreprocessorOptions.h"
 #include "llvm/Testing/Support/Error.h"
 #include "gtest/gtest.h"
+#include <optional>
 
 using namespace clang;
 
@@ -92,7 +93,7 @@
                    "#include \"head3.h\"\n#include \"head3.h\"\n"));
   FileMgr.setVirtualFileSystem(VFS);
 
-  Optional<FileEntryRef> FE;
+  OptionalFileEntryRef FE;
   ASSERT_THAT_ERROR(FileMgr.getFileRef("main.c").moveInto(FE),
                     llvm::Succeeded());
   SourceMgr.setMainFileID(
@@ -105,19 +106,19 @@
   SmallVector<std::unique_ptr<DepDirectives>> DepDirectivesObjects;
 
   auto getDependencyDirectives = [&](FileEntryRef File)
-      -> Optional<ArrayRef<dependency_directives_scan::Directive>> {
+      -> std::optional<ArrayRef<dependency_directives_scan::Directive>> {
     DepDirectivesObjects.push_back(std::make_unique<DepDirectives>());
     StringRef Input = (*FileMgr.getBufferForFile(File))->getBuffer();
     bool Err = scanSourceForDependencyDirectives(
         Input, DepDirectivesObjects.back()->Tokens,
         DepDirectivesObjects.back()->Directives);
     EXPECT_FALSE(Err);
-    return llvm::makeArrayRef(DepDirectivesObjects.back()->Directives);
+    return llvm::ArrayRef(DepDirectivesObjects.back()->Directives);
   };
 
   auto PPOpts = std::make_shared<PreprocessorOptions>();
   PPOpts->DependencyDirectivesForFile = [&](FileEntryRef File)
-      -> Optional<ArrayRef<dependency_directives_scan::Directive>> {
+      -> std::optional<ArrayRef<dependency_directives_scan::Directive>> {
     return getDependencyDirectives(File);
   };