File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed
Tooling/DependencyScanning Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -461,9 +461,9 @@ class IncludePPCallbacks : public PPCallbacks {
461
461
virtual void
462
462
InclusionDirective (SourceLocation HashLoc, const Token &IncludeTok,
463
463
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 ,
467
467
SrcMgr::CharacteristicKind FileType) override {
468
468
if (HashLoc.isFileID () && File)
469
469
addInclude (HashLoc, *File);
Original file line number Diff line number Diff line change @@ -200,9 +200,10 @@ struct IncludeTreePPCallbacks : public PPCallbacks {
200
200
StringRef FileName, bool IsAngled,
201
201
CharSourceRange FilenameRange,
202
202
OptionalFileEntryRef File, StringRef SearchPath,
203
- StringRef RelativePath, const Module *Imported,
203
+ StringRef RelativePath, const Module *SuggestedModule,
204
+ bool ModuleImported,
204
205
SrcMgr::CharacteristicKind FileType) override {
205
- if (!Imported )
206
+ if (!ModuleImported )
206
207
return ; // File includes handled by LexedFileChanged.
207
208
208
209
// Calculate EndLoc for the directive
@@ -219,7 +220,7 @@ struct IncludeTreePPCallbacks : public PPCallbacks {
219
220
} while (!Tok.isOneOf (tok::eod, tok::eof));
220
221
SourceLocation EndLoc = L.getSourceLocation ();
221
222
222
- Builder.moduleImport (PP, Imported , EndLoc);
223
+ Builder.moduleImport (PP, SuggestedModule , EndLoc);
223
224
}
224
225
225
226
void EnteredSubmodule (Module *M, SourceLocation ImportLoc,
You can’t perform that action at this time.
0 commit comments