Skip to content

Commit 3661a48

Browse files
committed
[clang] NFCI: Use FileEntryRef in SourceManager::getMemoryBufferForFileOr{None,Fake}()
1 parent 9c1cdc2 commit 3661a48

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

clang/include/clang/Basic/SourceManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,12 +942,12 @@ class SourceManager : public RefCountedBase<SourceManager> {
942942
///
943943
/// Returns std::nullopt if the buffer is not valid.
944944
std::optional<llvm::MemoryBufferRef>
945-
getMemoryBufferForFileOrNone(const FileEntry *File);
945+
getMemoryBufferForFileOrNone(FileEntryRef File);
946946

947947
/// Retrieve the memory buffer associated with the given file.
948948
///
949949
/// Returns a fake buffer if there isn't a real one.
950-
llvm::MemoryBufferRef getMemoryBufferForFileOrFake(const FileEntry *File) {
950+
llvm::MemoryBufferRef getMemoryBufferForFileOrFake(FileEntryRef File) {
951951
if (auto B = getMemoryBufferForFileOrNone(File))
952952
return *B;
953953
return getFakeBufferForRecovery();

clang/lib/Basic/SourceManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,8 +681,8 @@ SourceManager::createExpansionLocImpl(const ExpansionInfo &Info,
681681
}
682682

683683
std::optional<llvm::MemoryBufferRef>
684-
SourceManager::getMemoryBufferForFileOrNone(const FileEntry *File) {
685-
SrcMgr::ContentCache &IR = getOrCreateContentCache(File->getLastRef());
684+
SourceManager::getMemoryBufferForFileOrNone(FileEntryRef File) {
685+
SrcMgr::ContentCache &IR = getOrCreateContentCache(File);
686686
return IR.getBufferOrNone(Diag, getFileManager(), SourceLocation());
687687
}
688688

clang/lib/Tooling/Inclusions/HeaderAnalysis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ bool isImportLine(llvm::StringRef Line) {
5757
return Line.startswith("import");
5858
}
5959

60-
llvm::StringRef getFileContents(const FileEntry *FE, const SourceManager &SM) {
60+
llvm::StringRef getFileContents(FileEntryRef FE, const SourceManager &SM) {
6161
return const_cast<SourceManager &>(SM)
6262
.getMemoryBufferForFileOrNone(FE)
6363
.value_or(llvm::MemoryBufferRef())

0 commit comments

Comments
 (0)