From 0b874065274c0b143d6b36d9619b12310971d282 Mon Sep 17 00:00:00 2001 From: Sinan Kaya Date: Tue, 24 Sep 2019 06:24:09 +0000 Subject: [PATCH] Format patch --- src/jit/codegenarmarch.cpp | 4 ++-- src/jit/codegenlinear.cpp | 3 ++- src/jit/compiler.hpp | 3 ++- src/jit/emitxarch.cpp | 3 ++- src/jit/importer.cpp | 5 +++-- src/jit/instr.cpp | 3 ++- src/jit/ssabuilder.cpp | 6 ++++-- src/jit/valuenum.cpp | 5 +++-- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/jit/codegenarmarch.cpp b/src/jit/codegenarmarch.cpp index fdace848ce60..b0690069c0e4 100644 --- a/src/jit/codegenarmarch.cpp +++ b/src/jit/codegenarmarch.cpp @@ -2250,8 +2250,8 @@ void CodeGen::genRegCopy(GenTree* treeNode) varLiveKeeper->siUpdateVariableLiveRange(varDsc, lcl->GetLclNum()) #endif // USING_VARIABLE_LIVE_RANGE - // The new location is going live - genUpdateRegLife(varDsc, /*isBorn*/ true, /*isDying*/ false DEBUGARG(treeNode)); + // The new location is going live + genUpdateRegLife(varDsc, /*isBorn*/ true, /*isDying*/ false DEBUGARG(treeNode)); } } } diff --git a/src/jit/codegenlinear.cpp b/src/jit/codegenlinear.cpp index e7e3967b9a12..118dbe2ad440 100644 --- a/src/jit/codegenlinear.cpp +++ b/src/jit/codegenlinear.cpp @@ -969,7 +969,8 @@ void CodeGen::genUnspillRegIfNeeded(GenTree* tree) assert(!varTypeIsGC(varDsc)); var_types spillType = genActualType(varDsc->lvType); unspillTree->gtType = spillType; - inst_RV_TT(ins_Load(spillType, compiler->isSIMDTypeLocalAligned(lcl->GetLclNum())), dstReg, unspillTree); + inst_RV_TT(ins_Load(spillType, compiler->isSIMDTypeLocalAligned(lcl->GetLclNum())), dstReg, + unspillTree); unspillTree->gtType = treeType; } else diff --git a/src/jit/compiler.hpp b/src/jit/compiler.hpp index 655087085849..74b834f0a48a 100644 --- a/src/jit/compiler.hpp +++ b/src/jit/compiler.hpp @@ -3828,7 +3828,8 @@ inline bool Compiler::impIsThis(GenTree* obj) } else { - return ((obj != nullptr) && (obj->gtOper == GT_LCL_VAR) && lvaIsOriginalThisArg(obj->gtLclVarCommon.GetLclNum())); + return ((obj != nullptr) && (obj->gtOper == GT_LCL_VAR) && + lvaIsOriginalThisArg(obj->gtLclVarCommon.GetLclNum())); } } diff --git a/src/jit/emitxarch.cpp b/src/jit/emitxarch.cpp index 6409e93ce9a5..fbc49726bffd 100644 --- a/src/jit/emitxarch.cpp +++ b/src/jit/emitxarch.cpp @@ -3369,7 +3369,8 @@ regNumber emitter::emitInsBinary(instruction ins, emitAttr attr, GenTree* dst, G case GT_LCL_VAR: { - assert(memOp->IsRegOptional() || !emitComp->lvaTable[memOp->gtLclVar.GetLclNum()].lvIsRegCandidate()); + assert(memOp->IsRegOptional() || + !emitComp->lvaTable[memOp->gtLclVar.GetLclNum()].lvIsRegCandidate()); varNum = memOp->AsLclVar()->GetLclNum(); offset = 0; break; diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp index 9687ff1173a4..ba49a2d0bdf4 100644 --- a/src/jit/importer.cpp +++ b/src/jit/importer.cpp @@ -2555,7 +2555,7 @@ BasicBlock* Compiler::impPushCatchArgOnStack(BasicBlock* hndBlk, CORINFO_CLASS_H #if defined(JIT32_GCENCODER) const bool forceInsertNewBlock = isSingleBlockFilter || compStressCompile(STRESS_CATCH_ARG, 5); #else - const bool forceInsertNewBlock = compStressCompile(STRESS_CATCH_ARG, 5); + const bool forceInsertNewBlock = compStressCompile(STRESS_CATCH_ARG, 5); #endif // defined(JIT32_GCENCODER) /* Spill GT_CATCH_ARG to a temp if there are jumps to the beginning of the handler */ @@ -8336,7 +8336,8 @@ var_types Compiler::impImportCall(OPCODE opcode, } assert(newobjThis->gtOper == GT_LCL_VAR); - impPushOnStack(gtNewLclvNode(newobjThis->gtLclVarCommon.GetLclNum(), TYP_REF), typeInfo(TI_REF, clsHnd)); + impPushOnStack(gtNewLclvNode(newobjThis->gtLclVarCommon.GetLclNum(), TYP_REF), + typeInfo(TI_REF, clsHnd)); } } return callRetTyp; diff --git a/src/jit/instr.cpp b/src/jit/instr.cpp index 930ce3018191..2f981f660f58 100644 --- a/src/jit/instr.cpp +++ b/src/jit/instr.cpp @@ -1139,7 +1139,8 @@ void CodeGen::inst_RV_TT_IV(instruction ins, emitAttr attr, regNumber reg1, GenT case GT_LCL_VAR: { - assert(rmOp->IsRegOptional() || !compiler->lvaGetDesc(rmOp->gtLclVar.GetLclNum())->lvIsRegCandidate()); + assert(rmOp->IsRegOptional() || + !compiler->lvaGetDesc(rmOp->gtLclVar.GetLclNum())->lvIsRegCandidate()); varNum = rmOp->AsLclVar()->GetLclNum(); offset = 0; break; diff --git a/src/jit/ssabuilder.cpp b/src/jit/ssabuilder.cpp index 44ff7ba721c0..8167503ba672 100644 --- a/src/jit/ssabuilder.cpp +++ b/src/jit/ssabuilder.cpp @@ -1937,7 +1937,8 @@ void Compiler::JitTestCheckSSA() { printf(" Node: "); printTreeID(lcl); - printf(", SSA name = <%d, %d> -- SSA name class %d.\n", lcl->GetLclNum(), lcl->GetSsaNum(), tlAndN.m_num); + printf(", SSA name = <%d, %d> -- SSA name class %d.\n", lcl->GetLclNum(), lcl->GetSsaNum(), + tlAndN.m_num); } SSAName ssaNm; if (labelToSSA->Lookup(tlAndN.m_num, &ssaNm)) @@ -1954,7 +1955,8 @@ void Compiler::JitTestCheckSSA() if (tlAndN.m_num != num2) { printf("Node: "); - printTreeID(lcl); printf(", SSA name = <%d, %d> was declared in SSA name class %d,\n", lcl->GetLclNum(), + printTreeID(lcl); + printf(", SSA name = <%d, %d> was declared in SSA name class %d,\n", lcl->GetLclNum(), lcl->GetSsaNum(), tlAndN.m_num); printf( "but this SSA name <%d,%d> has already been associated with a different SSA name class: %d.\n", diff --git a/src/jit/valuenum.cpp b/src/jit/valuenum.cpp index bda668403ea5..87d28a2887d6 100644 --- a/src/jit/valuenum.cpp +++ b/src/jit/valuenum.cpp @@ -7123,7 +7123,7 @@ void Compiler::fgValueNumberTree(GenTree* tree) assert(rhsVNPair.GetLiberal() != ValueNumStore::NoVN); - lhs->gtVNPair = rhsVNPair; + lhs->gtVNPair = rhsVNPair; lvaTable[lcl->GetLclNum()].GetPerSsaData(lclDefSsaNum)->m_vnPair = rhsVNPair; #ifdef DEBUG @@ -7191,7 +7191,8 @@ void Compiler::fgValueNumberTree(GenTree* tree) { // We don't know what field this represents. Assign a new VN to the whole variable // (since we may be writing to an unknown portion of it.) - newLhsVNPair.SetBoth(vnStore->VNForExpr(compCurBB, lvaGetActualType(lclFld->GetLclNum()))); + newLhsVNPair.SetBoth( + vnStore->VNForExpr(compCurBB, lvaGetActualType(lclFld->GetLclNum()))); } else {