OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Fix a regression introduced when adding subframework support 

llvm-svn: 39022
This commit is contained in:
Chris Lattner 2006-10-20 05:12:14 +00:00
parent 62aa0d4c9f
commit 5c683b2b4b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/Lex/Preprocessor.cpp
View File

@ -271,7 +271,7 @@ const FileEntry *Preprocessor::LookupFile(const std::string &Filename,
// 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 (CurLexer) {
if (CurLexer && !CurLexer->Is_PragmaLexer) {
CurFileEnt = SourceMgr.getFileEntryForFileID(CurLexer->getCurFileID());
if ((FE = HeaderInfo.LookupSubframeworkHeader(Filename, CurFileEnt)))
return FE;
@ -279,7 +279,7 @@ const FileEntry *Preprocessor::LookupFile(const std::string &Filename,
for (unsigned i = 0, e = IncludeMacroStack.size(); i != e; ++i) {
IncludeStackInfo &ISEntry = IncludeMacroStack[e-i-1];
if (ISEntry.TheLexer) {
if (ISEntry.TheLexer && !ISEntry.TheLexer->Is_PragmaLexer) {
CurFileEnt =
SourceMgr.getFileEntryForFileID(ISEntry.TheLexer->getCurFileID());
if ((FE = HeaderInfo.LookupSubframeworkHeader(Filename, CurFileEnt)))