Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Format patch
Browse files Browse the repository at this point in the history
  • Loading branch information
franksinankaya committed Sep 24, 2019
1 parent f01f832 commit 0b87406
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/jit/codegenarmarch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/jit/codegenlinear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/jit/compiler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/jit/emitxarch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/jit/importer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/jit/instr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions src/jit/ssabuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/jit/valuenum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit 0b87406

Please sign in to comment.