clangd: Stop calling FileEntryRef::FileEntryRef

[dexonsmith]

Summary

In ReplayPreamble::replay, use getFileRef instead of getFile, and
then use that FileEntryRef later to avoid needing
FileEntryRef::FileEntryRef. The latter is going to become private to
FileManager in a later commit.

[arphaman]

LGTM with a nit.

clang-tools-extra/clangd/ParsedAST.cpp

222

You can drop the FIXME here now.

[dexonsmith]

Committed in 434f3774f629f5896614e9efb4eda82d813402ed.

clang-tools-extra/clangd/ParsedAST.cpp

222

Good point, fixed.

clang-tools-extra/clangd/ParsedAST.cpp

void FileChanged(SourceLocation Loc, FileChangeReason Reason,
     // It'd be nice if there was a better way to identify built-in headers...
     if (Reason == FileChangeReason::ExitFile &&
         SM.getBufferOrFake(PrevFID).getBufferIdentifier() == "<built-in>")
       replay();
   }
 
   void replay() {
     for (const auto &Inc : Includes) {
-      const FileEntry *File = nullptr;
+      llvm::Optional<FileEntryRef> File;
       if (Inc.Resolved != "")
-        if (auto FE = SM.getFileManager().getFile(Inc.Resolved))
-          File = *FE;
+        File = expectedToOptional(SM.getFileManager().getFileRef(Inc.Resolved));
 
       // Re-lex the #include directive to find its interesting parts.
       auto HashLoc = SM.getComposedLoc(SM.getMainFileID(), Inc.HashOffset);
       auto HashTok = llvm::partition_point(MainFileTokens,
                                            [&HashLoc](const syntax::Token &T) {
                                              return T.location() < HashLoc;
                                            });
       assert(HashTok != MainFileTokens.end() && HashTok->kind() == tok::hash);
for (const auto &Inc : Includes) {
       // Note that we can't make use of FileTok->length/text in here as in the
       // case of angled includes this will contain tok::less instead of
       // filename. Whereas Inc.Written contains the full header name including
       // quotes/angles.
       SynthesizedFilenameTok.setLength(Inc.Written.length());
       SynthesizedFilenameTok.setKind(tok::header_name);
       SynthesizedFilenameTok.setLiteralData(Inc.Written.data());
 
+      const FileEntry *FE = File ? &File->getFileEntry() : nullptr;
       llvm::StringRef WrittenFilename =
           llvm::StringRef(Inc.Written).drop_front().drop_back();
       Delegate->InclusionDirective(HashTok->location(), SynthesizedIncludeTok,
                                    WrittenFilename, Inc.Written.front() == '<',
-                                   FileTok->range(SM).toCharRange(SM), File,
+                                   FileTok->range(SM).toCharRange(SM), FE,
                                    "SearchPath", "RelPath",
                                    /*Imported=*/nullptr, Inc.FileKind);
       if (File)
         // FIXME: Use correctly named FileEntryRef.
-        Delegate->FileSkipped(FileEntryRef(File->getName(), *File),
-                              SynthesizedFilenameTok, Inc.FileKind);
+        Delegate->FileSkipped(*File, SynthesizedFilenameTok, Inc.FileKind);
       else {
         llvm::SmallString<1> UnusedRecovery;
         Delegate->FileNotFound(WrittenFilename, UnusedRecovery);
       }
     }
   }
 
   const std::vector<Inclusion> Includes;