diff options
| -rw-r--r-- | include/clang/Lex/VariadicMacroSupport.h | 4 | ||||
| -rw-r--r-- | lib/Lex/TokenLexer.cpp | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/clang/Lex/VariadicMacroSupport.h b/include/clang/Lex/VariadicMacroSupport.h index fae0063a4e..cebaf15187 100644 --- a/include/clang/Lex/VariadicMacroSupport.h +++ b/include/clang/Lex/VariadicMacroSupport.h @@ -69,8 +69,6 @@ namespace clang { /// \brief A class for tracking whether we're inside a VA_OPT during a /// traversal of the tokens of a variadic macro definition. class VAOptDefinitionContext { - Preprocessor &PP; - /// Contains all the locations of so far unmatched lparens. SmallVector<SourceLocation, 8> UnmatchedOpeningParens; @@ -79,7 +77,7 @@ namespace clang { public: VAOptDefinitionContext(Preprocessor &PP) - : PP(PP), Ident__VA_OPT__(PP.Ident__VA_OPT__) {} + : Ident__VA_OPT__(PP.Ident__VA_OPT__) {} bool isVAOptToken(const Token &T) const { return Ident__VA_OPT__ && T.getIdentifierInfo() == Ident__VA_OPT__; diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp index c0883dd48e..194ceecc07 100644 --- a/lib/Lex/TokenLexer.cpp +++ b/lib/Lex/TokenLexer.cpp @@ -184,18 +184,12 @@ void TokenLexer::stringifyVAOPTContents( // Perform token pasting (concatenation) prior to stringization. for (unsigned int CurTokenIdx = 0; CurTokenIdx != NumVAOptTokens; ++CurTokenIdx) { - const unsigned int PrevTokenIdx = CurTokenIdx; - if (VAOPTTokens[CurTokenIdx].is(tok::hashhash)) { assert(CurTokenIdx != 0 && "Can not have __VAOPT__ contents begin with a ##"); Token &LHS = VAOPTTokens[CurTokenIdx - 1]; pasteTokens(LHS, llvm::makeArrayRef(VAOPTTokens, NumVAOptTokens), CurTokenIdx); - // CurTokenIdx is either the same as NumTokens or one past the - // last token concatenated. - // PrevTokenIdx is the index of the hashhash - const unsigned NumTokensPastedTogether = CurTokenIdx - PrevTokenIdx + 1; // Replace the token prior to the first ## in this iteration. ConcatenatedVAOPTResultToks.back() = LHS; if (CurTokenIdx == NumVAOptTokens) |