Skip to content

Commit d79ad2f

Browse files
jansvoboda11jansvoboda11
committed
[clang][lex] NFCI: Use FileEntryRef in PPCallbacks::InclusionDirective()
This patch changes type of the `File` parameter in `PPCallbacks::InclusionDirective()` from `const FileEntry *` to `Optional<FileEntryRef>`. With the API change in place, this patch then removes some uses of the deprecated `FileEntry::getName()` (e.g. in `DependencyGraph.cpp` and `ModuleDependencyCollector.cpp`). Reviewed By: dexonsmith, bnbarham Differential Revision: https://reviews.llvm.org/D123574
1 parent defce20 commit d79ad2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+171
-155
lines changed

‎clang-tools-extra/clang-move/Move.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class FindAllIncludes : public PPCallbacks {
131131
void InclusionDirective(SourceLocation HashLoc, const Token & /*IncludeTok*/,
132132
StringRef FileName, bool IsAngled,
133133
CharSourceRange FilenameRange,
134-
const FileEntry * /*File*/, StringRef SearchPath,
134+
Optional<FileEntryRef> /*File*/, StringRef SearchPath,
135135
StringRef /*RelativePath*/,
136136
const Module * /*Imported*/,
137137
SrcMgr::CharacteristicKind /*FileType*/) override {

‎clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,9 @@ void ExpandModularHeadersPPCallbacks::FileChanged(
162162
void ExpandModularHeadersPPCallbacks::InclusionDirective(
163163
SourceLocation DirectiveLoc, const Token &IncludeToken,
164164
StringRef IncludedFilename, bool IsAngled, CharSourceRange FilenameRange,
165-
const FileEntry *IncludedFile, StringRef SearchPath, StringRef RelativePath,
166-
const Module *Imported, SrcMgr::CharacteristicKind FileType) {
165+
Optional<FileEntryRef> IncludedFile, StringRef SearchPath,
166+
StringRef RelativePath, const Module *Imported,
167+
SrcMgr::CharacteristicKind FileType) {
167168
if (Imported) {
168169
serialization::ModuleFile *MF =
169170
Compiler.getASTReader()->getModuleManager().lookup(

‎clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ class ExpandModularHeadersPPCallbacks : public PPCallbacks {
6969
void InclusionDirective(SourceLocation DirectiveLoc,
7070
const Token &IncludeToken, StringRef IncludedFilename,
7171
bool IsAngled, CharSourceRange FilenameRange,
72-
const FileEntry *IncludedFile, StringRef SearchPath,
73-
StringRef RelativePath, const Module *Imported,
72+
Optional<FileEntryRef> IncludedFile,
73+
StringRef SearchPath, StringRef RelativePath,
74+
const Module *Imported,
7475
SrcMgr::CharacteristicKind FileType) override;
7576

7677
void EndOfMainFile() override;

‎clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class KernelNameRestrictionPPCallbacks : public PPCallbacks {
2929

3030
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
3131
StringRef FileName, bool IsAngled,
32-
CharSourceRange FileNameRange, const FileEntry *File,
33-
StringRef SearchPath, StringRef RelativePath,
34-
const Module *Imported,
32+
CharSourceRange FileNameRange,
33+
Optional<FileEntryRef> File, StringRef SearchPath,
34+
StringRef RelativePath, const Module *Imported,
3535
SrcMgr::CharacteristicKind FileType) override;
3636

3737
void EndOfMainFile() override;
@@ -62,8 +62,8 @@ void KernelNameRestrictionCheck::registerPPCallbacks(const SourceManager &SM,
6262

6363
void KernelNameRestrictionPPCallbacks::InclusionDirective(
6464
SourceLocation HashLoc, const Token &, StringRef FileName, bool,
65-
CharSourceRange, const FileEntry *, StringRef, StringRef, const Module *,
66-
SrcMgr::CharacteristicKind) {
65+
CharSourceRange, Optional<FileEntryRef>, StringRef, StringRef,
66+
const Module *, SrcMgr::CharacteristicKind) {
6767
IncludeDirective ID = {HashLoc, FileName};
6868
IncludeDirectives.push_back(std::move(ID));
6969
}

‎clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class SuspiciousIncludePPCallbacks : public PPCallbacks {
2424

2525
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
2626
StringRef FileName, bool IsAngled,
27-
CharSourceRange FilenameRange, const FileEntry *File,
28-
StringRef SearchPath, StringRef RelativePath,
29-
const Module *Imported,
27+
CharSourceRange FilenameRange,
28+
Optional<FileEntryRef> File, StringRef SearchPath,
29+
StringRef RelativePath, const Module *Imported,
3030
SrcMgr::CharacteristicKind FileType) override;
3131

3232
private:
@@ -72,7 +72,7 @@ void SuspiciousIncludeCheck::registerPPCallbacks(
7272

7373
void SuspiciousIncludePPCallbacks::InclusionDirective(
7474
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
75-
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
75+
bool IsAngled, CharSourceRange FilenameRange, Optional<FileEntryRef> File,
7676
StringRef SearchPath, StringRef RelativePath, const Module *Imported,
7777
SrcMgr::CharacteristicKind FileType) {
7878
if (IncludeTok.getIdentifierInfo()->getPPKeywordID() == tok::pp_import)

‎clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class IncludeOrderPPCallbacks : public PPCallbacks {
2626

2727
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
2828
StringRef FileName, bool IsAngled,
29-
CharSourceRange FilenameRange, const FileEntry *File,
30-
StringRef SearchPath, StringRef RelativePath,
31-
const Module *Imported,
29+
CharSourceRange FilenameRange,
30+
Optional<FileEntryRef> File, StringRef SearchPath,
31+
StringRef RelativePath, const Module *Imported,
3232
SrcMgr::CharacteristicKind FileType) override;
3333
void EndOfMainFile() override;
3434

@@ -81,7 +81,7 @@ static int getPriority(StringRef Filename, bool IsAngled, bool IsMainModule) {
8181

8282
void IncludeOrderPPCallbacks::InclusionDirective(
8383
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
84-
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
84+
bool IsAngled, CharSourceRange FilenameRange, Optional<FileEntryRef> File,
8585
StringRef SearchPath, StringRef RelativePath, const Module *Imported,
8686
SrcMgr::CharacteristicKind FileType) {
8787
// We recognize the first include as a special main module header and want

‎clang-tools-extra/clang-tidy/llvmlibc/RestrictSystemLibcHeadersCheck.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class RestrictedIncludesPPCallbacks
3333

3434
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
3535
StringRef FileName, bool IsAngled,
36-
CharSourceRange FilenameRange, const FileEntry *File,
37-
StringRef SearchPath, StringRef RelativePath,
38-
const Module *Imported,
36+
CharSourceRange FilenameRange,
37+
Optional<FileEntryRef> File, StringRef SearchPath,
38+
StringRef RelativePath, const Module *Imported,
3939
SrcMgr::CharacteristicKind FileType) override;
4040

4141
private:
@@ -46,7 +46,7 @@ class RestrictedIncludesPPCallbacks
4646

4747
void RestrictedIncludesPPCallbacks::InclusionDirective(
4848
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
49-
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
49+
bool IsAngled, CharSourceRange FilenameRange, Optional<FileEntryRef> File,
5050
StringRef SearchPath, StringRef RelativePath, const Module *Imported,
5151
SrcMgr::CharacteristicKind FileType) {
5252
// Compiler provided headers are allowed (e.g stddef.h).

‎clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class IncludeModernizePPCallbacks : public PPCallbacks {
2727

2828
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
2929
StringRef FileName, bool IsAngled,
30-
CharSourceRange FilenameRange, const FileEntry *File,
31-
StringRef SearchPath, StringRef RelativePath,
32-
const Module *Imported,
30+
CharSourceRange FilenameRange,
31+
Optional<FileEntryRef> File, StringRef SearchPath,
32+
StringRef RelativePath, const Module *Imported,
3333
SrcMgr::CharacteristicKind FileType) override;
3434

3535
private:
@@ -91,7 +91,7 @@ IncludeModernizePPCallbacks::IncludeModernizePPCallbacks(ClangTidyCheck &Check,
9191

9292
void IncludeModernizePPCallbacks::InclusionDirective(
9393
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
94-
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
94+
bool IsAngled, CharSourceRange FilenameRange, Optional<FileEntryRef> File,
9595
StringRef SearchPath, StringRef RelativePath, const Module *Imported,
9696
SrcMgr::CharacteristicKind FileType) {
9797
// FIXME: Take care of library symbols from the global namespace.

‎clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ class MacroToEnumCallbacks : public PPCallbacks {
133133

134134
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
135135
StringRef FileName, bool IsAngled,
136-
CharSourceRange FilenameRange, const FileEntry *File,
137-
StringRef SearchPath, StringRef RelativePath,
138-
const Module *Imported,
136+
CharSourceRange FilenameRange,
137+
Optional<FileEntryRef> File, StringRef SearchPath,
138+
StringRef RelativePath, const Module *Imported,
139139
SrcMgr::CharacteristicKind FileType) override {
140140
clearCurrentEnum(HashLoc);
141141
}

‎clang-tools-extra/clang-tidy/portability/RestrictSystemIncludesCheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace portability {
2222

2323
void RestrictedIncludesPPCallbacks::InclusionDirective(
2424
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
25-
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
25+
bool IsAngled, CharSourceRange FilenameRange, Optional<FileEntryRef> File,
2626
StringRef SearchPath, StringRef RelativePath, const Module *Imported,
2727
SrcMgr::CharacteristicKind FileType) {
2828
if (!Check.contains(FileName) && SrcMgr::isSystem(FileType)) {

‎clang-tools-extra/clang-tidy/portability/RestrictSystemIncludesCheck.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class RestrictedIncludesPPCallbacks : public PPCallbacks {
5050

5151
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
5252
StringRef FileName, bool IsAngled,
53-
CharSourceRange FilenameRange, const FileEntry *File,
54-
StringRef SearchPath, StringRef RelativePath,
55-
const Module *Imported,
53+
CharSourceRange FilenameRange,
54+
Optional<FileEntryRef> File, StringRef SearchPath,
55+
StringRef RelativePath, const Module *Imported,
5656
SrcMgr::CharacteristicKind FileType) override;
5757
void EndOfMainFile() override;
5858

‎clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class DuplicateIncludeCallbacks : public PPCallbacks {
4747

4848
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
4949
StringRef FileName, bool IsAngled,
50-
CharSourceRange FilenameRange, const FileEntry *File,
51-
StringRef SearchPath, StringRef RelativePath,
52-
const Module *Imported,
50+
CharSourceRange FilenameRange,
51+
Optional<FileEntryRef> File, StringRef SearchPath,
52+
StringRef RelativePath, const Module *Imported,
5353
SrcMgr::CharacteristicKind FileType) override;
5454

5555
void MacroDefined(const Token &MacroNameTok,
@@ -77,7 +77,7 @@ void DuplicateIncludeCallbacks::FileChanged(SourceLocation Loc,
7777

7878
void DuplicateIncludeCallbacks::InclusionDirective(
7979
SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
80-
bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
80+
bool IsAngled, CharSourceRange FilenameRange, Optional<FileEntryRef> File,
8181
StringRef SearchPath, StringRef RelativePath, const Module *Imported,
8282
SrcMgr::CharacteristicKind FileType) {
8383
if (llvm::find(Files.back(), FileName) != Files.back().end()) {

‎clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class IncludeInserterCallback : public PPCallbacks {
2424
void InclusionDirective(SourceLocation HashLocation,
2525
const Token &IncludeToken, StringRef FileNameRef,
2626
bool IsAngled, CharSourceRange FileNameRange,
27-
const FileEntry * /*IncludedFile*/,
27+
Optional<FileEntryRef> /*IncludedFile*/,
2828
StringRef /*SearchPath*/, StringRef /*RelativePath*/,
2929
const Module * /*ImportedModule*/,
3030
SrcMgr::CharacteristicKind /*FileType*/) override {

‎clang-tools-extra/clangd/Headers.cpp

+13-11
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ class IncludeStructure::RecordHeaders : public PPCallbacks,
3535
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
3636
llvm::StringRef FileName, bool IsAngled,
3737
CharSourceRange /*FilenameRange*/,
38-
const FileEntry *File, llvm::StringRef /*SearchPath*/,
38+
Optional<FileEntryRef> File,
39+
llvm::StringRef /*SearchPath*/,
3940
llvm::StringRef /*RelativePath*/,
4041
const clang::Module * /*Imported*/,
4142
SrcMgr::CharacteristicKind FileKind) override {
@@ -51,7 +52,8 @@ class IncludeStructure::RecordHeaders : public PPCallbacks,
5152
auto &Inc = Out->MainFileIncludes.back();
5253
Inc.Written =
5354
(IsAngled ? "<" + FileName + ">" : "\"" + FileName + "\"").str();
54-
Inc.Resolved = std::string(File ? File->tryGetRealPathName() : "");
55+
Inc.Resolved =
56+
std::string(File ? File->getFileEntry().tryGetRealPathName() : "");
5557
Inc.HashOffset = SM.getFileOffset(HashLoc);
5658
Inc.HashLine =
5759
SM.getLineNumber(SM.getFileID(HashLoc), Inc.HashOffset) - 1;
@@ -60,7 +62,7 @@ class IncludeStructure::RecordHeaders : public PPCallbacks,
6062
if (LastPragmaKeepInMainFileLine == Inc.HashLine)
6163
Inc.BehindPragmaKeep = true;
6264
if (File) {
63-
IncludeStructure::HeaderID HID = Out->getOrCreateID(File);
65+
IncludeStructure::HeaderID HID = Out->getOrCreateID(*File);
6466
Inc.HeaderID = static_cast<unsigned>(HID);
6567
if (IsAngled)
6668
if (auto StdlibHeader = tooling::stdlib::Header::named(Inc.Written)) {
@@ -74,15 +76,15 @@ class IncludeStructure::RecordHeaders : public PPCallbacks,
7476

7577
// Record include graph (not just for main-file includes)
7678
if (File) {
77-
auto *IncludingFileEntry = SM.getFileEntryForID(SM.getFileID(HashLoc));
79+
auto IncludingFileEntry = SM.getFileEntryRefForID(SM.getFileID(HashLoc));
7880
if (!IncludingFileEntry) {
7981
assert(SM.getBufferName(HashLoc).startswith("<") &&
8082
"Expected #include location to be a file or <built-in>");
8183
// Treat as if included from the main file.
82-
IncludingFileEntry = SM.getFileEntryForID(MainFID);
84+
IncludingFileEntry = SM.getFileEntryRefForID(MainFID);
8385
}
84-
auto IncludingID = Out->getOrCreateID(IncludingFileEntry),
85-
IncludedID = Out->getOrCreateID(File);
86+
auto IncludingID = Out->getOrCreateID(*IncludingFileEntry),
87+
IncludedID = Out->getOrCreateID(*File);
8688
Out->IncludeChildren[IncludingID].push_back(IncludedID);
8789
}
8890
}
@@ -226,22 +228,22 @@ IncludeStructure::getID(const FileEntry *Entry) const {
226228
}
227229

228230
IncludeStructure::HeaderID
229-
IncludeStructure::getOrCreateID(const FileEntry *Entry) {
231+
IncludeStructure::getOrCreateID(FileEntryRef Entry) {
230232
// Main file's FileEntry was not known at IncludeStructure creation time.
231-
if (Entry == MainFileEntry) {
233+
if (&Entry.getFileEntry() == MainFileEntry) {
232234
if (RealPathNames.front().empty())
233235
RealPathNames.front() = MainFileEntry->tryGetRealPathName().str();
234236
return MainFileID;
235237
}
236238
auto R = UIDToIndex.try_emplace(
237-
Entry->getUniqueID(),
239+
Entry.getUniqueID(),
238240
static_cast<IncludeStructure::HeaderID>(RealPathNames.size()));
239241
if (R.second)
240242
RealPathNames.emplace_back();
241243
IncludeStructure::HeaderID Result = R.first->getSecond();
242244
std::string &RealPathName = RealPathNames[static_cast<unsigned>(Result)];
243245
if (RealPathName.empty())
244-
RealPathName = Entry->tryGetRealPathName().str();
246+
RealPathName = Entry.getFileEntry().tryGetRealPathName().str();
245247
return Result;
246248
}
247249

‎clang-tools-extra/clangd/Headers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class IncludeStructure {
134134
enum class HeaderID : unsigned {};
135135

136136
llvm::Optional<HeaderID> getID(const FileEntry *Entry) const;
137-
HeaderID getOrCreateID(const FileEntry *Entry);
137+
HeaderID getOrCreateID(FileEntryRef Entry);
138138

139139
StringRef getRealPath(HeaderID ID) const {
140140
assert(static_cast<unsigned>(ID) <= RealPathNames.size());

‎clang-tools-extra/clangd/ParsedAST.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ class ReplayPreamble : private PPCallbacks {
211211
SynthesizedFilenameTok.setKind(tok::header_name);
212212
SynthesizedFilenameTok.setLiteralData(Inc.Written.data());
213213

214-
const FileEntry *FE = File ? &File->getFileEntry() : nullptr;
215214
llvm::StringRef WrittenFilename =
216215
llvm::StringRef(Inc.Written).drop_front().drop_back();
217216
Delegate->InclusionDirective(
@@ -220,7 +219,7 @@ class ReplayPreamble : private PPCallbacks {
220219
syntax::FileRange(SM, SynthesizedFilenameTok.getLocation(),
221220
SynthesizedFilenameTok.getEndLoc())
222221
.toCharRange(SM),
223-
FE, "SearchPath", "RelPath",
222+
File, "SearchPath", "RelPath",
224223
/*Imported=*/nullptr, Inc.FileKind);
225224
if (File)
226225
Delegate->FileSkipped(*File, SynthesizedFilenameTok, Inc.FileKind);

‎clang-tools-extra/clangd/index/IndexAction.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ namespace clang {
2828
namespace clangd {
2929
namespace {
3030

31-
llvm::Optional<std::string> toURI(const FileEntry *File) {
31+
llvm::Optional<std::string> toURI(Optional<FileEntryRef> File) {
3232
if (!File)
3333
return llvm::None;
34-
auto AbsolutePath = File->tryGetRealPathName();
34+
auto AbsolutePath = File->getFileEntry().tryGetRealPathName();
3535
if (AbsolutePath.empty())
3636
return llvm::None;
3737
return URI::create(AbsolutePath).toString();
@@ -58,7 +58,7 @@ struct IncludeGraphCollector : public PPCallbacks {
5858
return;
5959

6060
const auto FileID = SM.getFileID(Loc);
61-
const auto *File = SM.getFileEntryForID(FileID);
61+
auto File = SM.getFileEntryRefForID(FileID);
6262
auto URI = toURI(File);
6363
if (!URI)
6464
return;
@@ -84,15 +84,16 @@ struct IncludeGraphCollector : public PPCallbacks {
8484
// Add edges from including files to includes.
8585
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
8686
llvm::StringRef FileName, bool IsAngled,
87-
CharSourceRange FilenameRange, const FileEntry *File,
87+
CharSourceRange FilenameRange,
88+
Optional<FileEntryRef> File,
8889
llvm::StringRef SearchPath,
8990
llvm::StringRef RelativePath, const Module *Imported,
9091
SrcMgr::CharacteristicKind FileType) override {
9192
auto IncludeURI = toURI(File);
9293
if (!IncludeURI)
9394
return;
9495

95-
auto IncludingURI = toURI(SM.getFileEntryForID(SM.getFileID(HashLoc)));
96+
auto IncludingURI = toURI(SM.getFileEntryRefForID(SM.getFileID(HashLoc)));
9697
if (!IncludingURI)
9798
return;
9899

@@ -106,7 +107,7 @@ struct IncludeGraphCollector : public PPCallbacks {
106107
void FileSkipped(const FileEntryRef &SkippedFile, const Token &FilenameTok,
107108
SrcMgr::CharacteristicKind FileType) override {
108109
#ifndef NDEBUG
109-
auto URI = toURI(&SkippedFile.getFileEntry());
110+
auto URI = toURI(SkippedFile);
110111
if (!URI)
111112
return;
112113
auto I = IG.try_emplace(*URI);

‎clang-tools-extra/clangd/unittests/HeadersTests.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "llvm/Support/Error.h"
2020
#include "llvm/Support/FormatVariadic.h"
2121
#include "llvm/Support/Path.h"
22+
#include "llvm/Testing/Support/Error.h"
2223
#include "gmock/gmock.h"
2324
#include "gtest/gtest.h"
2425

@@ -68,8 +69,8 @@ class HeadersTest : public ::testing::Test {
6869
IncludeStructure::HeaderID getID(StringRef Filename,
6970
IncludeStructure &Includes) {
7071
auto &SM = Clang->getSourceManager();
71-
auto Entry = SM.getFileManager().getFile(Filename);
72-
EXPECT_TRUE(Entry);
72+
auto Entry = SM.getFileManager().getFileRef(Filename);
73+
EXPECT_THAT_EXPECTED(Entry, llvm::Succeeded());
7374
return Includes.getOrCreateID(*Entry);
7475
}
7576

0 commit comments

Comments
 (0)