diff options
Diffstat (limited to 'clang/lib/Frontend')
| -rw-r--r-- | clang/lib/Frontend/FrontendActions.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Frontend/VerifyDiagnosticConsumer.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp index 5c7567fa8c0..91eccbb26fd 100644 --- a/clang/lib/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/FrontendActions.cpp @@ -172,11 +172,12 @@ static void collectModuleHeaderIncludes(const LangOptions &LangOpts, return; // Add includes for each of these headers. - for (unsigned I = 0, N = Module->Headers.size(); I != N; ++I) { - const FileEntry *Header = Module->Headers[I]; + for (unsigned I = 0, N = Module->NormalHeaders.size(); I != N; ++I) { + const FileEntry *Header = Module->NormalHeaders[I]; Module->addTopHeader(Header); addHeaderInclude(Header, Includes, LangOpts); } + // Note that Module->PrivateHeaders will not be a TopHeader. if (const FileEntry *UmbrellaHeader = Module->getUmbrellaHeader()) { Module->addTopHeader(UmbrellaHeader); diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp index 46745b6b9a4..efe6005ed78 100644 --- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp +++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp @@ -371,7 +371,7 @@ static bool ParseDirective(StringRef S, ExpectedData *ED, SourceManager &SM, // Lookup file via Preprocessor, like a #include. const DirectoryLookup *CurDir; - const FileEntry *FE = PP->LookupFile(Filename, false, NULL, CurDir, + const FileEntry *FE = PP->LookupFile(Pos, Filename, false, NULL, CurDir, NULL, NULL, 0); if (!FE) { Diags.Report(Pos.getLocWithOffset(PH.C-PH.Begin), |
