Revert r167801, "[preprocessor] When #including something that contributes no

tokens at all,". This change broke External/Nurbs in LLVM test-suite.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167858 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1 insertions, 11 deletions

diff --git a/include/clang/Lex/PreprocessorLexer.h b/include/clang/Lex/PreprocessorLexer.h
index b85729dd08..20fb8a0c48 100644
--- a/include/clang/Lex/PreprocessorLexer.h
+++ b/include/clang/Lex/PreprocessorLexer.h
@@ -61,10 +61,6 @@ protected:
   /// Note that in raw mode that the PP pointer may be null.
   bool LexingRawMode;
 
-  /// \brief When true, if EOF of the current lexer is found, tok::included_eof
-  /// is returned instead of continuing lexing higher in the include stack.
-  bool EnableIncludedEOF;
-
   /// \brief A state machine that detects the \#ifndef-wrapping a file
   /// idiom for the multiple-include optimization.
   MultipleIncludeOpt MIOpt;
@@ -83,8 +79,7 @@ protected:
     : PP(0), InitialNumSLocEntries(0),
       ParsingPreprocessorDirective(false),
       ParsingFilename(false),
-      LexingRawMode(false),
-      EnableIncludedEOF(false) {}
+      LexingRawMode(false) {}
 
   virtual ~PreprocessorLexer() {}
 
@@ -152,11 +147,6 @@ public:
   /// \brief Return true if this lexer is in raw mode or not.
   bool isLexingRawMode() const { return LexingRawMode; }
 
-  /// \brief When true, if EOF of the current lexer is found, tok::included_eof
-  /// is returned instead of continuing lexing higher in the include stack.
-  /// False is the default behavior.
-  void setEnableIncludedEOF(bool Enable) { EnableIncludedEOF = Enable; }
-
   /// \brief Return the preprocessor object for this lexer.
   Preprocessor *getPP() const { return PP; }