[clang] NFCI: Use FileEntryRef in `SourceManager::getMemoryBufferFo…

…rFileOr{None,Fake}()`
llvm · Sep 29, 2023 · 3661a48 · 3661a48
1 parent 9c1cdc2
commit 3661a48
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/clang/include/clang/Basic/SourceManager.h b/clang/include/clang/Basic/SourceManager.h
@@ -942,12 +942,12 @@ class SourceManager : public RefCountedBase<SourceManager> {
   ///
   /// Returns std::nullopt if the buffer is not valid.
   std::optional<llvm::MemoryBufferRef>
-  getMemoryBufferForFileOrNone(const FileEntry *File);
+  getMemoryBufferForFileOrNone(FileEntryRef File);
 
   /// Retrieve the memory buffer associated with the given file.
   ///
   /// Returns a fake buffer if there isn't a real one.
-  llvm::MemoryBufferRef getMemoryBufferForFileOrFake(const FileEntry *File) {
+  llvm::MemoryBufferRef getMemoryBufferForFileOrFake(FileEntryRef File) {
     if (auto B = getMemoryBufferForFileOrNone(File))
       return *B;
     return getFakeBufferForRecovery();

diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp
@@ -681,8 +681,8 @@ SourceManager::createExpansionLocImpl(const ExpansionInfo &Info,
 }
 
 std::optional<llvm::MemoryBufferRef>
-SourceManager::getMemoryBufferForFileOrNone(const FileEntry *File) {
-  SrcMgr::ContentCache &IR = getOrCreateContentCache(File->getLastRef());
+SourceManager::getMemoryBufferForFileOrNone(FileEntryRef File) {
+  SrcMgr::ContentCache &IR = getOrCreateContentCache(File);
   return IR.getBufferOrNone(Diag, getFileManager(), SourceLocation());
 }
 

diff --git a/clang/lib/Tooling/Inclusions/HeaderAnalysis.cpp b/clang/lib/Tooling/Inclusions/HeaderAnalysis.cpp
@@ -57,7 +57,7 @@ bool isImportLine(llvm::StringRef Line) {
   return Line.startswith("import");
 }
 
-llvm::StringRef getFileContents(const FileEntry *FE, const SourceManager &SM) {
+llvm::StringRef getFileContents(FileEntryRef FE, const SourceManager &SM) {
   return const_cast<SourceManager &>(SM)
       .getMemoryBufferForFileOrNone(FE)
       .value_or(llvm::MemoryBufferRef())