diff options
| author | Ted Kremenek <kremenek@apple.com> | 2008-11-19 01:54:47 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2008-11-19 01:54:47 +0000 |
| commit | a7c279ba409061337b7caf3a7e6cd233e9bbb24d (patch) | |
| tree | 956e89ce28ae8ca51c0e3366ee974a2cbe6e1e5a /clang/lib/Lex/PPDirectives.cpp | |
| parent | 5a205a57d88d1c7a0d9341c91f1d94c004633d9b (diff) | |
| download | bcm5719-llvm-a7c279ba409061337b7caf3a7e6cd233e9bbb24d.tar.gz bcm5719-llvm-a7c279ba409061337b7caf3a7e6cd233e9bbb24d.zip | |
Revert 59574 (caused tests to fail).
llvm-svn: 59579
Diffstat (limited to 'clang/lib/Lex/PPDirectives.cpp')
| -rw-r--r-- | clang/lib/Lex/PPDirectives.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index cee2f406cdb..07c5f8ea68e 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -317,7 +317,7 @@ const FileEntry *Preprocessor::LookupFile(const char *FilenameStart, // Otherwise, see if this is a subframework header. If so, this is relative // to one of the headers on the #include stack. Walk the list of the current // headers on the #include stack and pass them to HeaderInfo. - if (IsNonPragmaNonMacroLexer()) { + if (CurLexer && !CurLexer->Is_PragmaLexer) { if ((CurFileEnt = SourceMgr.getFileEntryForLoc(CurLexer->getFileLoc()))) if ((FE = HeaderInfo.LookupSubframeworkHeader(FilenameStart, FilenameEnd, CurFileEnt))) @@ -326,7 +326,7 @@ const FileEntry *Preprocessor::LookupFile(const char *FilenameStart, for (unsigned i = 0, e = IncludeMacroStack.size(); i != e; ++i) { IncludeStackInfo &ISEntry = IncludeMacroStack[e-i-1]; - if (IsNonPragmaNonMacroLexer(ISEntry)) { + if (ISEntry.TheLexer && !ISEntry.TheLexer->Is_PragmaLexer) { if ((CurFileEnt = SourceMgr.getFileEntryForLoc(ISEntry.TheLexer->getFileLoc()))) if ((FE = HeaderInfo.LookupSubframeworkHeader(FilenameStart, |
