Skip to content

Commit 36611a4

Browse files
committed
JIT format
1 parent f3356ad commit 36611a4

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

src/coreclr/jit/codegencommon.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,9 +2278,9 @@ void CodeGen::genReportEH()
22782278
{
22792279
if (compiler->UsesCallfinallyThunks())
22802280
{
2281-
printf(
2282-
"%d EH table entries, %d duplicate clauses, %d cloned finallys, %d total EH entries reported to VM\n",
2283-
compiler->compHndBBtabCount, duplicateClauseCount, clonedFinallyCount, EHCount);
2281+
printf("%d EH table entries, %d duplicate clauses, %d cloned finallys, %d total EH entries reported to "
2282+
"VM\n",
2283+
compiler->compHndBBtabCount, duplicateClauseCount, clonedFinallyCount, EHCount);
22842284
assert(compiler->compHndBBtabCount + duplicateClauseCount + clonedFinallyCount == EHCount);
22852285
}
22862286
else
@@ -2639,7 +2639,7 @@ void CodeGen::genReportEH()
26392639
} // for each block
26402640

26412641
assert(clonedFinallyCount == reportedClonedFinallyCount);
2642-
} // if (clonedFinallyCount > 0)
2642+
} // if (clonedFinallyCount > 0)
26432643

26442644
assert(XTnum == EHCount);
26452645
}

src/coreclr/jit/fgehopt.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ PhaseStatus Compiler::fgRemoveEmptyTry()
337337
BasicBlock* const lastTryBlock = HBtab->ebdTryLast;
338338
BasicBlock* const firstHandlerBlock = HBtab->ebdHndBeg;
339339
BasicBlock* const lastHandlerBlock = HBtab->ebdHndLast;
340-
BasicBlock* callFinally;
340+
BasicBlock* callFinally;
341341

342342
assert(firstTryBlock->getTryIndex() == XTnum);
343343

@@ -401,7 +401,8 @@ PhaseStatus Compiler::fgRemoveEmptyTry()
401401
// Try must be a callalways pair of blocks.
402402
if (!firstTryBlock->NextIs(lastTryBlock))
403403
{
404-
JITDUMP("EH#%u block " FMT_BB " not last block in try; skipping.\n", XTnum, firstTryBlock->Next()->bbNum);
404+
JITDUMP("EH#%u block " FMT_BB " not last block in try; skipping.\n", XTnum,
405+
firstTryBlock->Next()->bbNum);
405406
XTnum++;
406407
continue;
407408
}

src/coreclr/jit/importer.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4872,10 +4872,12 @@ void Compiler::impImportLeave(BasicBlock* block)
48724872

48734873
if (UsesCallfinallyThunks())
48744874
{
4875-
callFinallyTryIndex =
4876-
(HBtab->ebdEnclosingTryIndex == EHblkDsc::NO_ENCLOSING_INDEX) ? 0 : HBtab->ebdEnclosingTryIndex + 1;
4877-
callFinallyHndIndex =
4878-
(HBtab->ebdEnclosingHndIndex == EHblkDsc::NO_ENCLOSING_INDEX) ? 0 : HBtab->ebdEnclosingHndIndex + 1;
4875+
callFinallyTryIndex = (HBtab->ebdEnclosingTryIndex == EHblkDsc::NO_ENCLOSING_INDEX)
4876+
? 0
4877+
: HBtab->ebdEnclosingTryIndex + 1;
4878+
callFinallyHndIndex = (HBtab->ebdEnclosingHndIndex == EHblkDsc::NO_ENCLOSING_INDEX)
4879+
? 0
4880+
: HBtab->ebdEnclosingHndIndex + 1;
48794881
}
48804882
else
48814883
{

src/coreclr/jit/jiteh.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,9 +952,9 @@ void Compiler::ehGetCallFinallyBlockRange(unsigned finallyIndex, BasicBlock** st
952952
}
953953
else
954954
{
955-
EHblkDsc* ehDsc = ehGetDsc(finallyIndex);
956-
*startBlock = ehDsc->ebdTryBeg;
957-
*lastBlock = ehDsc->ebdTryLast;
955+
EHblkDsc* ehDsc = ehGetDsc(finallyIndex);
956+
*startBlock = ehDsc->ebdTryBeg;
957+
*lastBlock = ehDsc->ebdTryLast;
958958
}
959959
}
960960

0 commit comments

Comments
 (0)