Skip to content

Commit 4945a23

Browse files
committed
[clang][lex] Fix build failure after da95d92
1 parent 3a12a27 commit 4945a23

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

clang/lib/Index/IndexingAction.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,9 @@ class IncludePPCallbacks : public PPCallbacks {
461461
virtual void
462462
InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
463463
StringRef FileName, bool IsAngled,
464-
CharSourceRange FilenameRange,
465-
OptionalFileEntryRef File, StringRef SearchPath,
466-
StringRef RelativePath, const Module *Imported,
464+
CharSourceRange FilenameRange, OptionalFileEntryRef File,
465+
StringRef SearchPath, StringRef RelativePath,
466+
const Module *SuggestedModule, bool ModuleImported,
467467
SrcMgr::CharacteristicKind FileType) override {
468468
if (HashLoc.isFileID() && File)
469469
addInclude(HashLoc, *File);

clang/lib/Tooling/DependencyScanning/IncludeTreeActionController.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,10 @@ struct IncludeTreePPCallbacks : public PPCallbacks {
200200
StringRef FileName, bool IsAngled,
201201
CharSourceRange FilenameRange,
202202
OptionalFileEntryRef File, StringRef SearchPath,
203-
StringRef RelativePath, const Module *Imported,
203+
StringRef RelativePath, const Module *SuggestedModule,
204+
bool ModuleImported,
204205
SrcMgr::CharacteristicKind FileType) override {
205-
if (!Imported)
206+
if (!ModuleImported)
206207
return; // File includes handled by LexedFileChanged.
207208

208209
// Calculate EndLoc for the directive
@@ -219,7 +220,7 @@ struct IncludeTreePPCallbacks : public PPCallbacks {
219220
} while (!Tok.isOneOf(tok::eod, tok::eof));
220221
SourceLocation EndLoc = L.getSourceLocation();
221222

222-
Builder.moduleImport(PP, Imported, EndLoc);
223+
Builder.moduleImport(PP, SuggestedModule, EndLoc);
223224
}
224225

225226
void EnteredSubmodule(Module *M, SourceLocation ImportLoc,

0 commit comments

Comments
 (0)