dexonsmith created this revision.
dexonsmith added reviewers: arphaman, JDevlieghere, jansvoboda11.
Herald added a subscriber: ributzka.
dexonsmith requested review of this revision.
Herald added a project: clang.
Add a `FileEntryRef` overload of `SourceManager::translateFile`, and
migrate `ParseDirective` in VerifyDiagnosticConsumer.cpp to use it and
the corresponding overload of `createFileID`.
No functionality change here.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D92699
Files:
clang/include/clang/Basic/SourceManager.h
clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
Index: clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
===================================================================
--- clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -554,10 +554,9 @@
continue;
}
- const FileEntry *FE = &File->getFileEntry();
- FileID FID = SM.translateFile(FE);
+ FileID FID = SM.translateFile(*File);
if (FID.isInvalid())
- FID = SM.createFileID(FE, Pos, SrcMgr::C_User);
+ FID = SM.createFileID(*File, Pos, SrcMgr::C_User);
if (PH.Next(Line) && Line > 0)
ExpectedLoc = SM.translateLineCol(FID, Line, 1);
Index: clang/include/clang/Basic/SourceManager.h
===================================================================
--- clang/include/clang/Basic/SourceManager.h
+++ clang/include/clang/Basic/SourceManager.h
@@ -1593,6 +1593,9 @@
/// If the source file is included multiple times, the FileID will be the
/// first inclusion.
FileID translateFile(const FileEntry *SourceFile) const;
+ FileID translateFile(FileEntryRef SourceFile) const {
+ return translateFile(&SourceFile.getFileEntry());
+ }
/// Get the source location in \p FID for the given line:col.
/// Returns null location if \p FID is not a file SLocEntry.
Index: clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
===================================================================
--- clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -554,10 +554,9 @@
continue;
}
- const FileEntry *FE = &File->getFileEntry();
- FileID FID = SM.translateFile(FE);
+ FileID FID = SM.translateFile(*File);
if (FID.isInvalid())
- FID = SM.createFileID(FE, Pos, SrcMgr::C_User);
+ FID = SM.createFileID(*File, Pos, SrcMgr::C_User);
if (PH.Next(Line) && Line > 0)
ExpectedLoc = SM.translateLineCol(FID, Line, 1);
Index: clang/include/clang/Basic/SourceManager.h
===================================================================
--- clang/include/clang/Basic/SourceManager.h
+++ clang/include/clang/Basic/SourceManager.h
@@ -1593,6 +1593,9 @@
/// If the source file is included multiple times, the FileID will be the
/// first inclusion.
FileID translateFile(const FileEntry *SourceFile) const;
+ FileID translateFile(FileEntryRef SourceFile) const {
+ return translateFile(&SourceFile.getFileEntry());
+ }
/// Get the source location in \p FID for the given line:col.
/// Returns null location if \p FID is not a file SLocEntry.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
