From: Faisal Vali Date: Tue, 3 Oct 2017 01:33:36 +0000 (+0000) Subject: Add parens around the boolean condition of one of the added asserts in r314747 ... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a419e7edff49ad1ca5a4d7a80962c9d8bd1dc70;p=clang Add parens around the boolean condition of one of the added asserts in r314747 ... ... in the hopes of teaching the bots the gift of silence ;) For quick reference: https://reviews.llvm.org/rL314747 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@314753 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp index f8f9400db9..df6ad5276a 100644 --- a/lib/Lex/TokenLexer.cpp +++ b/lib/Lex/TokenLexer.cpp @@ -531,9 +531,9 @@ bool TokenLexer::pasteTokens(Token &Tok) { bool TokenLexer::pasteTokens(Token &LHSTok, ArrayRef TokenStream, unsigned int &CurIdx) { assert(CurIdx > 0 && "## can not be the first token within tokens"); - assert(TokenStream[CurIdx].is(tok::hashhash) || + assert((TokenStream[CurIdx].is(tok::hashhash) || (PP.getLangOpts().MSVCCompat && - isWideStringLiteralFromMacro(LHSTok, TokenStream[CurIdx])) && + isWideStringLiteralFromMacro(LHSTok, TokenStream[CurIdx]))) && "Token at this Index must be ## or part of the MSVC 'L " "#macro-arg' pasting pair");