From be5c64d7a765acaf9454e7a511233771472bf811 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 4 Feb 2009 19:45:07 +0000 Subject: [PATCH] Fix PR3464 by searching for headers from the predefines buffer as if the #include happened from the main file. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63764 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Lex/PPDirectives.cpp | 15 +++++++++++++-- test/Preprocessor/include-directive1.c | 5 ----- test/Preprocessor/include-directive3.c | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 test/Preprocessor/include-directive3.c diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 00cb62384e..c38310b925 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -399,13 +399,24 @@ const FileEntry *Preprocessor::LookupFile(const char *FilenameStart, if (!FromDir) { FileID FID = getCurrentFileLexer()->getFileID(); CurFileEnt = SourceMgr.getFileEntryForID(FID); + + // If there is no file entry associated with this file, it must be the + // predefines buffer. Any other file is not lexed with a normal lexer, so + // it won't be scanned for preprocessor directives. If we have the + // predefines buffer, resolve #include references (which come from the + // -include command line argument) as if they came from the main file, this + // affects file lookup etc. + if (CurFileEnt == 0) { + FID = SourceMgr.getMainFileID(); + CurFileEnt = SourceMgr.getFileEntryForID(FID); + } } // Do a standard file entry lookup. CurDir = CurDirLookup; const FileEntry *FE = - HeaderInfo.LookupFile(FilenameStart, FilenameEnd, - isAngled, FromDir, CurDir, CurFileEnt); + HeaderInfo.LookupFile(FilenameStart, FilenameEnd, + isAngled, FromDir, CurDir, CurFileEnt); if (FE) return FE; // Otherwise, see if this is a subframework header. If so, this is relative diff --git a/test/Preprocessor/include-directive1.c b/test/Preprocessor/include-directive1.c index 632760b7cd..3e449c5268 100644 --- a/test/Preprocessor/include-directive1.c +++ b/test/Preprocessor/include-directive1.c @@ -1,4 +1,3 @@ - // RUN: clang -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3 // XX expands to nothing. @@ -13,7 +12,3 @@ // normal include #include "file_to_include.h" -// Expand and paste angled strings. -# define HEADER -# include HEADER - diff --git a/test/Preprocessor/include-directive3.c b/test/Preprocessor/include-directive3.c new file mode 100644 index 0000000000..9e22d5d492 --- /dev/null +++ b/test/Preprocessor/include-directive3.c @@ -0,0 +1,3 @@ +// RUN: clang -include file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1 +// PR3464 + -- 2.40.0