[cfe-commits] r39022 - /cfe/cfe/trunk/Lex/Preprocessor.cpp

[sabre at cs.uiuc.edu]

Author: sabre
Date: Wed Jul 11 11:26:55 2007
New Revision: 39022

URL: http://llvm.org/viewvc/llvm-project?rev=39022&view=rev
Log:
Fix a regression introduced when adding subframework support

Modified:
    cfe/cfe/trunk/Lex/Preprocessor.cpp

Modified: cfe/cfe/trunk/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Lex/Preprocessor.cpp?rev=39022&r1=39021&r2=39022&view=diff

==============================================================================
--- cfe/cfe/trunk/Lex/Preprocessor.cpp (original)
+++ cfe/cfe/trunk/Lex/Preprocessor.cpp Wed Jul 11 11:26:55 2007
@@ -271,7 +271,7 @@
   // 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 @@
   
   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)))