diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2013-01-16 19:32:21 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2013-01-16 19:32:21 +0000 |
| commit | 6ce0000dd52815db5ad3e7ff67fd14df244a2d81 (patch) | |
| tree | a4c5533bc291655897c0519843ca6ae0d909056a /clang/lib/Lex/Preprocessor.cpp | |
| parent | 0fab22544f065c4be06e3f3eda495a76dce17ae7 (diff) | |
| download | bcm5719-llvm-6ce0000dd52815db5ad3e7ff67fd14df244a2d81.tar.gz bcm5719-llvm-6ce0000dd52815db5ad3e7ff67fd14df244a2d81.zip | |
No longer crashing with an assert when __has_include or __has_include_next is used outside of a preprocessor directive. This fixes PR14837.
llvm-svn: 172639
Diffstat (limited to 'clang/lib/Lex/Preprocessor.cpp')
| -rw-r--r-- | clang/lib/Lex/Preprocessor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 9ce4874f63f..ccb2df0602a 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -69,7 +69,8 @@ Preprocessor::Preprocessor(IntrusiveRefCntPtr<PreprocessorOptions> PPOpts, CodeCompletionFile(0), CodeCompletionOffset(0), CodeCompletionReached(0), SkipMainFilePreamble(0, true), CurPPLexer(0), CurDirLookup(0), CurLexerKind(CLK_Lexer), Callbacks(0), Listener(0), - MacroArgCache(0), Record(0), MIChainHead(0), MICache(0) + MacroArgCache(0), Record(0), MIChainHead(0), MICache(0), + ParsingIfOrElifDirective(false) { OwnsHeaderSearch = OwnsHeaders; |
