Author: rtrieu Date: Thu Feb 18 16:34:54 2016 New Revision: 261271 URL: http://llvm.org/viewvc/llvm-project?rev=261271&view=rev Log: Remove use of builtin comma operator.
Cleanup for upcoming Clang warning -Wcomma. No functionality change intended. Modified: cfe/trunk/lib/Analysis/FormatString.cpp cfe/trunk/lib/Basic/SourceManager.cpp cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp cfe/trunk/lib/Frontend/FrontendActions.cpp cfe/trunk/lib/Frontend/PrintPreprocessedOutput.cpp cfe/trunk/lib/Lex/Lexer.cpp cfe/trunk/lib/Lex/PPExpressions.cpp cfe/trunk/lib/Rewrite/RewriteRope.cpp cfe/trunk/lib/Sema/SemaChecking.cpp cfe/trunk/lib/Sema/SemaOpenMP.cpp cfe/trunk/lib/Sema/SemaOverload.cpp cfe/trunk/lib/Sema/SemaStmt.cpp cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/lib/Analysis/FormatString.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/FormatString.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Analysis/FormatString.cpp (original) +++ cfe/trunk/lib/Analysis/FormatString.cpp Thu Feb 18 16:34:54 2016 @@ -190,13 +190,21 @@ clang::analyze_format_string::ParseLengt return false; case 'h': ++I; - lmKind = (I != E && *I == 'h') ? (++I, LengthModifier::AsChar) - : LengthModifier::AsShort; + if (I != E && *I == 'h') { + ++I; + lmKind = LengthModifier::AsChar; + } else { + lmKind = LengthModifier::AsShort; + } break; case 'l': ++I; - lmKind = (I != E && *I == 'l') ? (++I, LengthModifier::AsLongLong) - : LengthModifier::AsLong; + if (I != E && *I == 'l') { + ++I; + lmKind = LengthModifier::AsLongLong; + } else { + lmKind = LengthModifier::AsLong; + } break; case 'j': lmKind = LengthModifier::AsIntMax; ++I; break; case 'z': lmKind = LengthModifier::AsSizeT; ++I; break; Modified: cfe/trunk/lib/Basic/SourceManager.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/SourceManager.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Basic/SourceManager.cpp (original) +++ cfe/trunk/lib/Basic/SourceManager.cpp Thu Feb 18 16:34:54 2016 @@ -1258,15 +1258,19 @@ FoundSpecialChar: if (Buf[0] == '\n' || Buf[0] == '\r') { // If this is \n\r or \r\n, skip both characters. - if ((Buf[1] == '\n' || Buf[1] == '\r') && Buf[0] != Buf[1]) - ++Offs, ++Buf; - ++Offs, ++Buf; + if ((Buf[1] == '\n' || Buf[1] == '\r') && Buf[0] != Buf[1]) { + ++Offs; + ++Buf; + } + ++Offs; + ++Buf; LineOffsets.push_back(Offs); } else { // Otherwise, this is a null. If end of file, exit. if (Buf == End) break; // Otherwise, skip the null. - ++Offs, ++Buf; + ++Offs; + ++Buf; } } Modified: cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp (original) +++ cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp Thu Feb 18 16:34:54 2016 @@ -2760,7 +2760,8 @@ void CGOpenMPRuntime::emitTaskCall( PrivateHelpersTy( VD, cast<VarDecl>(cast<DeclRefExpr>(*I)->getDecl()), cast<VarDecl>(cast<DeclRefExpr>(*IElemInitRef)->getDecl())))); - ++I, ++IElemInitRef; + ++I; + ++IElemInitRef; } llvm::array_pod_sort(Privates.begin(), Privates.end(), array_pod_sort_comparator); @@ -3259,7 +3260,9 @@ static llvm::Value *emitReductionFunctio } else // Emit reduction for array subscript or single variable. CGF.EmitIgnoredExpr(E); - ++IPriv, ++ILHS, ++IRHS; + ++IPriv; + ++ILHS; + ++IRHS; } Scope.ForceCleanup(); CGF.FinishFunction(); @@ -3326,7 +3329,9 @@ void CGOpenMPRuntime::emitReduction(Code const Expr *) { CGF.EmitIgnoredExpr(E); }); } else CGF.EmitIgnoredExpr(E); - ++IPriv, ++ILHS, ++IRHS; + ++IPriv; + ++ILHS; + ++IRHS; } return; } @@ -3444,7 +3449,9 @@ void CGOpenMPRuntime::emitReduction(Code } else // Emit reduction for array subscript or single variable. CGF.EmitIgnoredExpr(E); - ++IPriv, ++ILHS, ++IRHS; + ++IPriv; + ++ILHS; + ++IRHS; } } @@ -3553,7 +3560,9 @@ void CGOpenMPRuntime::emitReduction(Code } else CritRedGen(CGF, nullptr, nullptr, nullptr); } - ++ILHS, ++IRHS, ++IPriv; + ++ILHS; + ++IRHS; + ++IPriv; } } Modified: cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original) +++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Thu Feb 18 16:34:54 2016 @@ -201,7 +201,8 @@ CodeGenFunction::GenerateOpenMPCapturedS // use the value that we get from the arguments. if (I->capturesVariableByCopy() && FD->getType()->isAnyPointerType()) { setAddrOfLocalVar(I->getCapturedVar(), GetAddrOfLocalVar(Args[Cnt])); - ++Cnt, ++I; + ++Cnt; + ++I; continue; } @@ -242,7 +243,8 @@ CodeGenFunction::GenerateOpenMPCapturedS CXXThisValue = EmitLoadOfLValue(ArgLVal, Args[Cnt]->getLocation()).getScalarVal(); } - ++Cnt, ++I; + ++Cnt; + ++I; } PGO.assignRegionCounters(GlobalDecl(CD), F); @@ -489,7 +491,8 @@ bool CodeGenFunction::EmitOMPFirstprivat // Silence the warning about unused variable. (void)IsRegistered; } - ++IRef, ++InitsRef; + ++IRef; + ++InitsRef; } } return FirstprivateIsLastprivate && !EmittedAsFirstprivate.empty(); @@ -628,7 +631,8 @@ bool CodeGenFunction::EmitOMPLastprivate (void)IsRegistered; } } - ++IRef, ++IDestRef; + ++IRef; + ++IDestRef; } } return HasAtLeastOneLastprivate; @@ -917,7 +921,9 @@ void CodeGenFunction::EmitOMPReductionCl }); } } - ++ILHS, ++IRHS, ++IPriv; + ++ILHS; + ++IRHS; + ++IPriv; } } } @@ -2013,7 +2019,8 @@ void CodeGenFunction::EmitOMPTaskDirecti FirstprivateCopies.push_back(IInit); FirstprivateInits.push_back(*IElemInitRef); } - ++IRef, ++IElemInitRef; + ++IRef; + ++IElemInitRef; } } // Build list of dependences. Modified: cfe/trunk/lib/Frontend/FrontendActions.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendActions.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/FrontendActions.cpp (original) +++ cfe/trunk/lib/Frontend/FrontendActions.cpp Thu Feb 18 16:34:54 2016 @@ -707,7 +707,8 @@ void PrintPreprocessedAction::ExecuteAct } else if (*cur == 0x0A) // LF break; - ++cur, ++next; + ++cur; + ++next; } } Modified: cfe/trunk/lib/Frontend/PrintPreprocessedOutput.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PrintPreprocessedOutput.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/PrintPreprocessedOutput.cpp (original) +++ cfe/trunk/lib/Frontend/PrintPreprocessedOutput.cpp Thu Feb 18 16:34:54 2016 @@ -545,8 +545,10 @@ void PrintPPOutputPPCallbacks::HandleNew // If we have \n\r or \r\n, skip both and count as one line. if (Len != 1 && (TokStr[1] == '\n' || TokStr[1] == '\r') && - TokStr[0] != TokStr[1]) - ++TokStr, --Len; + TokStr[0] != TokStr[1]) { + ++TokStr; + --Len; + } } if (NumNewlines == 0) return; Modified: cfe/trunk/lib/Lex/Lexer.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Lexer.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Lex/Lexer.cpp (original) +++ cfe/trunk/lib/Lex/Lexer.cpp Thu Feb 18 16:34:54 2016 @@ -719,7 +719,9 @@ SourceLocation Lexer::AdvanceToTokenChar while (Lexer::isObviouslySimpleCharacter(*TokPtr)) { if (CharNo == 0) return TokStart.getLocWithOffset(PhysOffset); - ++TokPtr, --CharNo, ++PhysOffset; + ++TokPtr; + --CharNo; + ++PhysOffset; } // If we have a character that may be a trigraph or escaped newline, use a Modified: cfe/trunk/lib/Lex/PPExpressions.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPExpressions.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Lex/PPExpressions.cpp (original) +++ cfe/trunk/lib/Lex/PPExpressions.cpp Thu Feb 18 16:34:54 2016 @@ -650,8 +650,10 @@ static bool EvaluateDirectiveSubExpr(PPV case tok::greatergreater: { // Determine whether overflow is about to happen. unsigned ShAmt = static_cast<unsigned>(RHS.Val.getLimitedValue()); - if (ShAmt >= LHS.getBitWidth()) - Overflow = true, ShAmt = LHS.getBitWidth()-1; + if (ShAmt >= LHS.getBitWidth()) { + Overflow = true; + ShAmt = LHS.getBitWidth()-1; + } Res = LHS.Val >> ShAmt; break; } Modified: cfe/trunk/lib/Rewrite/RewriteRope.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteRope.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Rewrite/RewriteRope.cpp (original) +++ cfe/trunk/lib/Rewrite/RewriteRope.cpp Thu Feb 18 16:34:54 2016 @@ -350,8 +350,10 @@ void RopePieceBTreeLeaf::erase(unsigned PieceOffs += getPiece(i).size(); // If we exactly include the last one, include it in the region to delete. - if (Offset+NumBytes == PieceOffs+getPiece(i).size()) - PieceOffs += getPiece(i).size(), ++i; + if (Offset+NumBytes == PieceOffs+getPiece(i).size()) { + PieceOffs += getPiece(i).size(); + ++i; + } // If we completely cover some RopePieces, erase them now. if (i != StartPiece) { Modified: cfe/trunk/lib/Sema/SemaChecking.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaChecking.cpp (original) +++ cfe/trunk/lib/Sema/SemaChecking.cpp Thu Feb 18 16:34:54 2016 @@ -1307,17 +1307,30 @@ static bool SemaBuiltinCpuSupports(Sema bool Sema::CheckX86BuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) { unsigned i = 0, l = 0, u = 0; switch (BuiltinID) { - default: return false; + default: + return false; case X86::BI__builtin_cpu_supports: return SemaBuiltinCpuSupports(*this, TheCall); case X86::BI__builtin_ms_va_start: return SemaBuiltinMSVAStart(TheCall); - case X86::BI_mm_prefetch: i = 1; l = 0; u = 3; break; - case X86::BI__builtin_ia32_sha1rnds4: i = 2, l = 0; u = 3; break; + case X86::BI_mm_prefetch: + i = 1; + l = 0; + u = 3; + break; + case X86::BI__builtin_ia32_sha1rnds4: + i = 2; + l = 0; + u = 3; + break; case X86::BI__builtin_ia32_vpermil2pd: case X86::BI__builtin_ia32_vpermil2pd256: case X86::BI__builtin_ia32_vpermil2ps: - case X86::BI__builtin_ia32_vpermil2ps256: i = 3, l = 0; u = 3; break; + case X86::BI__builtin_ia32_vpermil2ps256: + i = 3; + l = 0; + u = 3; + break; case X86::BI__builtin_ia32_cmpb128_mask: case X86::BI__builtin_ia32_cmpw128_mask: case X86::BI__builtin_ia32_cmpd128_mask: @@ -1341,13 +1354,25 @@ bool Sema::CheckX86BuiltinFunctionCall(u case X86::BI__builtin_ia32_ucmpb512_mask: case X86::BI__builtin_ia32_ucmpw512_mask: case X86::BI__builtin_ia32_ucmpd512_mask: - case X86::BI__builtin_ia32_ucmpq512_mask: i = 2; l = 0; u = 7; break; + case X86::BI__builtin_ia32_ucmpq512_mask: + i = 2; + l = 0; + u = 7; + break; case X86::BI__builtin_ia32_roundps: case X86::BI__builtin_ia32_roundpd: case X86::BI__builtin_ia32_roundps256: - case X86::BI__builtin_ia32_roundpd256: i = 1, l = 0; u = 15; break; + case X86::BI__builtin_ia32_roundpd256: + i = 1; + l = 0; + u = 15; + break; case X86::BI__builtin_ia32_roundss: - case X86::BI__builtin_ia32_roundsd: i = 2, l = 0; u = 15; break; + case X86::BI__builtin_ia32_roundsd: + i = 2; + l = 0; + u = 15; + break; case X86::BI__builtin_ia32_cmpps: case X86::BI__builtin_ia32_cmpss: case X86::BI__builtin_ia32_cmppd: @@ -1355,7 +1380,11 @@ bool Sema::CheckX86BuiltinFunctionCall(u case X86::BI__builtin_ia32_cmpps256: case X86::BI__builtin_ia32_cmppd256: case X86::BI__builtin_ia32_cmpps512_mask: - case X86::BI__builtin_ia32_cmppd512_mask: i = 2; l = 0; u = 31; break; + case X86::BI__builtin_ia32_cmppd512_mask: + i = 2; + l = 0; + u = 31; + break; case X86::BI__builtin_ia32_vpcomub: case X86::BI__builtin_ia32_vpcomuw: case X86::BI__builtin_ia32_vpcomud: @@ -1363,7 +1392,11 @@ bool Sema::CheckX86BuiltinFunctionCall(u case X86::BI__builtin_ia32_vpcomb: case X86::BI__builtin_ia32_vpcomw: case X86::BI__builtin_ia32_vpcomd: - case X86::BI__builtin_ia32_vpcomq: i = 2; l = 0; u = 7; break; + case X86::BI__builtin_ia32_vpcomq: + i = 2; + l = 0; + u = 7; + break; } return SemaBuiltinConstantArgRange(TheCall, i, l, u); } Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original) +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Thu Feb 18 16:34:54 2016 @@ -8458,7 +8458,8 @@ static bool FinishOpenMPLinearClause(OMP Updates.push_back(Update.get()); Finals.push_back(Final.get()); } - ++CurInit, ++CurPrivate; + ++CurInit; + ++CurPrivate; } Clause.setUpdates(Updates); Clause.setFinals(Finals); Modified: cfe/trunk/lib/Sema/SemaOverload.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaOverload.cpp (original) +++ cfe/trunk/lib/Sema/SemaOverload.cpp Thu Feb 18 16:34:54 2016 @@ -9056,8 +9056,10 @@ static void DiagnoseBadConversion(Sema & else { // TODO: detect and diagnose the full richness of const mismatches. if (CanQual<PointerType> FromPT = CFromTy->getAs<PointerType>()) - if (CanQual<PointerType> ToPT = CToTy->getAs<PointerType>()) - CFromTy = FromPT->getPointeeType(), CToTy = ToPT->getPointeeType(); + if (CanQual<PointerType> ToPT = CToTy->getAs<PointerType>()) { + CFromTy = FromPT->getPointeeType(); + CToTy = ToPT->getPointeeType(); + } } if (CToTy.getUnqualifiedType() == CFromTy.getUnqualifiedType() && Modified: cfe/trunk/lib/Sema/SemaStmt.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaStmt.cpp (original) +++ cfe/trunk/lib/Sema/SemaStmt.cpp Thu Feb 18 16:34:54 2016 @@ -980,7 +980,8 @@ Sema::ActOnFinishSwitchStmt(SourceLocati << SourceRange(CR->getLHS()->getLocStart(), Hi->getLocEnd()); CaseRanges.erase(CaseRanges.begin()+i); - --i, --e; + --i; + --e; continue; } Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=261271&r1=261270&r2=261271&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Thu Feb 18 16:34:54 2016 @@ -8683,7 +8683,8 @@ TEST_F(FormatTest, ConfigurableSpacesInP verifyFormat("#define x (( int )-1)", Spaces); // Run the first set of tests again with: - Spaces.SpacesInParentheses = false, Spaces.SpaceInEmptyParentheses = true; + Spaces.SpacesInParentheses = false; + Spaces.SpaceInEmptyParentheses = true; Spaces.SpacesInCStyleCastParentheses = true; verifyFormat("call(x, y, z);", Spaces); verifyFormat("call( );", Spaces); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits