diff options
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 10 | ||||
| -rw-r--r-- | test/Preprocessor/has_include.c | 27 |
2 files changed, 35 insertions, 2 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 3de6cdb39d..1b8fcbac33 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -985,8 +985,14 @@ static bool EvaluateHasIncludeCommon(Token &Tok, // Save '(' location for possible missing ')' message. LParenLoc = Tok.getLocation(); - // Get the file name. - PP.getCurrentLexer()->LexIncludeFilename(Tok); + if (PP.getCurrentLexer()) { + // Get the file name. + PP.getCurrentLexer()->LexIncludeFilename(Tok); + } else { + // We're in a macro, so we can't use LexIncludeFilename; just + // grab the next token. + PP.Lex(Tok); + } } // Reserve a buffer to get the spelling. diff --git a/test/Preprocessor/has_include.c b/test/Preprocessor/has_include.c index 10f7795fc3..985501a215 100644 --- a/test/Preprocessor/has_include.c +++ b/test/Preprocessor/has_include.c @@ -64,6 +64,33 @@ #error "defined(__has_include_next) failed (8)." #endif +// Fun with macros +#define MACRO1 __has_include(<stdint.h>) +#define MACRO2 ("stdint.h") +#define MACRO3 ("blahblah.h") +#define MACRO4 blahblah.h>) +#define MACRO5 <stdint.h> + +#if !MACRO1 + #error "__has_include with macro failed (1)." +#endif + +#if !__has_include MACRO2 + #error "__has_include with macro failed (2)." +#endif + +#if __has_include MACRO3 + #error "__has_include with macro failed (3)." +#endif + +#if __has_include(<MACRO4 + #error "__has_include with macro failed (4)." +#endif + +#if !__has_include(MACRO5) + #error "__has_include with macro failed (2)." +#endif + // Try badly formed expressions. // FIXME: We can recover better in almost all of these cases. (PR13335) |