Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JIT: Make BasicBlock::bbJumpKind private #92908

Merged
merged 5 commits into from
Oct 4, 2023
Merged

JIT: Make BasicBlock::bbJumpKind private #92908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a4bdf5
Make BasicBlock::bbJumpKind private
amanasifkhalid Oct 2, 2023
2378797
Convert bbJumpKind comparisons to KindIs()
amanasifkhalid Oct 2, 2023
a8c8a6c
Style
amanasifkhalid Oct 2, 2023
7aadbdc
Convert case
amanasifkhalid Oct 2, 2023
754743d
Typo
amanasifkhalid Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5260,7 +5260,7 @@ class AssertionPropFlowCallback
{
ASSERT_TP pAssertionOut;

if (predBlock->bbJumpKind == BBJ_COND && (predBlock->bbJumpDest == block))
if (predBlock->getBBJumpKind() == BBJ_COND && (predBlock->bbJumpDest == block))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like most uses can be replaced with an existing block->KindIs(...) (it also supports 'params').

Also, should it be Get or get?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for catching that -- I'll push a revision converting all the bbJumpKind comparisons to KindIs().

I'm not sure what the case should be. Some BasicBlock methods (like KindIs) use Pascal case, while others (like makeBlockHot) use camel case.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The convention for all new code in the Jit is to use PascalCase, except in LSRA (where camelCase is used consistently).

{
pAssertionOut = mJumpDestOut[predBlock->bbNum];

Expand Down Expand Up @@ -5460,7 +5460,7 @@ ASSERT_TP* Compiler::optComputeAssertionGen()

printf(FMT_BB " valueGen = ", block->bbNum);
optPrintAssertionIndices(block->bbAssertionGen);
if (block->bbJumpKind == BBJ_COND)
if (block->getBBJumpKind() == BBJ_COND)
{
printf(" => " FMT_BB " valueGen = ", block->bbJumpDest->bbNum);
optPrintAssertionIndices(jumpDestGen[block->bbNum]);
Expand Down Expand Up @@ -6020,7 +6020,7 @@ PhaseStatus Compiler::optAssertionPropMain()
printf(FMT_BB ":\n", block->bbNum);
optDumpAssertionIndices(" in = ", block->bbAssertionIn, "\n");
optDumpAssertionIndices(" out = ", block->bbAssertionOut, "\n");
if (block->bbJumpKind == BBJ_COND)
if (block->getBBJumpKind() == BBJ_COND)
{
printf(" " FMT_BB " = ", block->bbJumpDest->bbNum);
optDumpAssertionIndices(bbJtrueAssertionOut[block->bbNum], "\n");
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/jit/block.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ BasicBlock* Compiler::bbNewBasicBlock(BBjumpKinds jumpKind)

/* Record the jump kind in the block */

block->bbJumpKind = jumpKind;
block->setBBJumpKind(jumpKind DEBUG_ARG(this));

if (jumpKind == BBJ_THROW)
{
Expand Down Expand Up @@ -1499,9 +1499,9 @@ BasicBlock* Compiler::bbNewBasicBlock(BBjumpKinds jumpKind)
bool BasicBlock::isBBCallAlwaysPair() const
{
#if defined(FEATURE_EH_FUNCLETS) && defined(TARGET_ARM)
if (this->bbJumpKind == BBJ_CALLFINALLY)
if (this->getBBJumpKind() == BBJ_CALLFINALLY)
#else
if ((this->bbJumpKind == BBJ_CALLFINALLY) && !(this->bbFlags & BBF_RETLESS_CALL))
if ((this->getBBJumpKind() == BBJ_CALLFINALLY) && !(this->bbFlags & BBF_RETLESS_CALL))
#endif
{
#if defined(FEATURE_EH_FUNCLETS) && defined(TARGET_ARM)
Expand All @@ -1510,7 +1510,7 @@ bool BasicBlock::isBBCallAlwaysPair() const
#endif
// Some asserts that the next block is a BBJ_ALWAYS of the proper form.
assert(this->bbNext != nullptr);
assert(this->bbNext->bbJumpKind == BBJ_ALWAYS);
assert(this->bbNext->getBBJumpKind() == BBJ_ALWAYS);
assert(this->bbNext->bbFlags & BBF_KEEP_BBJ_ALWAYS);
assert(this->bbNext->isEmpty());

Expand Down
20 changes: 19 additions & 1 deletion src/coreclr/jit/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,26 @@ struct BasicBlock : private LIR::Range
// a block corresponding to an exit from the try of a try/finally.
bool isBBCallAlwaysPairTail() const;

private:
BBjumpKinds bbJumpKind; // jump (if any) at the end of this block

public:
BBjumpKinds getBBJumpKind() const
{
return bbJumpKind;
}

void setBBJumpKind(BBjumpKinds kind DEBUG_ARG(Compiler* comp))
{
#ifdef DEBUG
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm probably getting ahead of myself here, but I'm thinking we will need to track whether BBJ_NONE is allowed or not in the current Compiler's state, so passing in a pointer to it will enable us to assert this state. I avoided making this a noway_assert to minimize TP diffs, and made comp a debug arg to avoid unused variable warnings in Release builds (though this approach also has the negative effect of removing this assert in Checked builds).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would personally recommend using a verifier pattern (i. e. adding an assert somewhere in fgdiagnostic.cpp) for checking this property instead of the setters. It will make for less debug-only code overall.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the cleanliness of your suggestion, but if we move this check to somewhere like Compiler::fgDebugCheckBBlist instead of checking every time bbJumpKind is updated, then is there any need to make bbJumpKind private? @AndyAyersMS

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there any need to make bbJumpKind private

Not strictly, but it is still an improvement.

https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/clr-jit-coding-conventions.md

15.5.1 Public data members
Do not declare public data members. Instead, public accessor functions should be exposed to access class members.

Copy link
Member

@AndyAyersMS AndyAyersMS Oct 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please keep this field private.

Eventually we will probably do more work when the jump kind gets changed -- for instance calling add/remove ref on the appropriate blocks.

So having the extra comp argument here is also fine by me, it will prove useful down the road.

// BBJ_NONE should only be assigned when optimizing jumps in Compiler::optOptimizeLayout
// TODO: Change assert to check if comp is in appropriate optimization phase to use BBJ_NONE
// (right now, this assertion does the null check to avoid unused variable warnings)
assert((kind != BBJ_NONE) || (comp != nullptr));
#endif // DEBUG
bbJumpKind = kind;
}

/* The following union describes the jump target(s) of this block */
union {
unsigned bbJumpOffs; // PC offset (temporary only)
Expand Down Expand Up @@ -1556,7 +1574,7 @@ inline BBArrayIterator BBSwitchTargetList::end() const
inline BasicBlock::BBSuccList::BBSuccList(const BasicBlock* block)
{
assert(block != nullptr);
switch (block->bbJumpKind)
switch (block->getBBJumpKind())
{
case BBJ_THROW:
case BBJ_RETURN:
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/codegenarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ BasicBlock* CodeGen::genCallFinally(BasicBlock* block)
assert(block->isBBCallAlwaysPair());

assert(block->bbNext != NULL);
assert(block->bbNext->bbJumpKind == BBJ_ALWAYS);
assert(block->bbNext->getBBJumpKind() == BBJ_ALWAYS);
assert(block->bbNext->bbJumpDest != NULL);
assert(block->bbNext->bbJumpDest->bbFlags & BBF_FINALLY_TARGET);

Expand Down Expand Up @@ -630,7 +630,7 @@ void CodeGen::genTableBasedSwitch(GenTree* treeNode)
//
void CodeGen::genJumpTable(GenTree* treeNode)
{
noway_assert(compiler->compCurBB->bbJumpKind == BBJ_SWITCH);
noway_assert(compiler->compCurBB->getBBJumpKind() == BBJ_SWITCH);
assert(treeNode->OperGet() == GT_JMPTABLE);

unsigned jumpCount = compiler->compCurBB->bbJumpSwt->bbsCount;
Expand Down Expand Up @@ -1294,7 +1294,7 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
//
void CodeGen::genCodeForJTrue(GenTreeOp* jtrue)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);

GenTree* op = jtrue->gtGetOp1();
regNumber reg = genConsumeReg(op);
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/codegenarm64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3745,7 +3745,7 @@ void CodeGen::genTableBasedSwitch(GenTree* treeNode)
// emits the table and an instruction to get the address of the first element
void CodeGen::genJumpTable(GenTree* treeNode)
{
noway_assert(compiler->compCurBB->bbJumpKind == BBJ_SWITCH);
noway_assert(compiler->compCurBB->getBBJumpKind() == BBJ_SWITCH);
assert(treeNode->OperGet() == GT_JMPTABLE);

unsigned jumpCount = compiler->compCurBB->bbJumpSwt->bbsCount;
Expand Down Expand Up @@ -4646,7 +4646,7 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
//
void CodeGen::genCodeForJTrue(GenTreeOp* jtrue)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);

GenTree* op = jtrue->gtGetOp1();
regNumber reg = genConsumeReg(op);
Expand Down Expand Up @@ -4837,7 +4837,7 @@ void CodeGen::genCodeForSelect(GenTreeOp* tree)
//
void CodeGen::genCodeForJumpCompare(GenTreeOpCC* tree)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);

GenTree* op1 = tree->gtGetOp1();
GenTree* op2 = tree->gtGetOp2();
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/codegenarmarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5515,7 +5515,7 @@ void CodeGen::genFnEpilog(BasicBlock* block)
{
SetHasTailCalls(true);

noway_assert(block->bbJumpKind == BBJ_RETURN);
noway_assert(block->getBBJumpKind() == BBJ_RETURN);
noway_assert(block->GetFirstLIRNode() != nullptr);

/* figure out what jump we have */
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/codegencommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ void CodeGen::genMarkLabelsForCodegen()

for (BasicBlock* const block : compiler->Blocks())
{
switch (block->bbJumpKind)
switch (block->getBBJumpKind())
{
case BBJ_ALWAYS: // This will also handle the BBJ_ALWAYS of a BBJ_CALLFINALLY/BBJ_ALWAYS pair.
case BBJ_COND:
Expand Down Expand Up @@ -2256,7 +2256,7 @@ void CodeGen::genReportEH()
{
for (BasicBlock* const block : compiler->Blocks())
{
if (block->bbJumpKind == BBJ_CALLFINALLY)
if (block->getBBJumpKind() == BBJ_CALLFINALLY)
{
++clonedFinallyCount;
}
Expand Down Expand Up @@ -2582,7 +2582,7 @@ void CodeGen::genReportEH()
unsigned reportedClonedFinallyCount = 0;
for (BasicBlock* const block : compiler->Blocks())
{
if (block->bbJumpKind == BBJ_CALLFINALLY)
if (block->getBBJumpKind() == BBJ_CALLFINALLY)
{
UNATIVE_OFFSET hndBeg, hndEnd;

Expand Down
12 changes: 6 additions & 6 deletions src/coreclr/jit/codegenlinear.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ void CodeGen::genCodeForBBlist()
//
// Note: We need to have set compCurBB before calling emitAddLabel
//
if ((block->bbPrev != nullptr) && (block->bbPrev->bbJumpKind == BBJ_COND) &&
if ((block->bbPrev != nullptr) && (block->bbPrev->getBBJumpKind() == BBJ_COND) &&
(block->bbWeight != block->bbPrev->bbWeight))
{
JITDUMP("Adding label due to BB weight difference: BBJ_COND " FMT_BB " with weight " FMT_WT
Expand Down Expand Up @@ -619,7 +619,7 @@ void CodeGen::genCodeForBBlist()
{
// We only need the NOP if we're not going to generate any more code as part of the block end.

switch (block->bbJumpKind)
switch (block->getBBJumpKind())
{
case BBJ_ALWAYS:
case BBJ_THROW:
Expand Down Expand Up @@ -662,7 +662,7 @@ void CodeGen::genCodeForBBlist()

/* Do we need to generate a jump or return? */

switch (block->bbJumpKind)
switch (block->getBBJumpKind())
{
case BBJ_RETURN:
genExitCode(block);
Expand Down Expand Up @@ -812,10 +812,10 @@ void CodeGen::genCodeForBBlist()
assert(ShouldAlignLoops());
assert(!block->isBBCallAlwaysPairTail());
#if FEATURE_EH_CALLFINALLY_THUNKS
assert(block->bbJumpKind != BBJ_CALLFINALLY);
assert(block->getBBJumpKind() != BBJ_CALLFINALLY);
#endif // FEATURE_EH_CALLFINALLY_THUNKS

GetEmitter()->emitLoopAlignment(DEBUG_ARG1(block->bbJumpKind == BBJ_ALWAYS));
GetEmitter()->emitLoopAlignment(DEBUG_ARG1(block->getBBJumpKind() == BBJ_ALWAYS));
}

if ((block->bbNext != nullptr) && (block->bbNext->isLoopAlign()))
Expand Down Expand Up @@ -2615,7 +2615,7 @@ void CodeGen::genStoreLongLclVar(GenTree* treeNode)
//
void CodeGen::genCodeForJcc(GenTreeCC* jcc)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);
assert(jcc->OperIs(GT_JCC));

inst_JCC(jcc->gtCondition, compiler->compCurBB->bbJumpDest);
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/codegenloongarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ void CodeGen::genFnEpilog(BasicBlock* block)
{
SetHasTailCalls(true);

noway_assert(block->bbJumpKind == BBJ_RETURN);
noway_assert(block->getBBJumpKind() == BBJ_RETURN);
noway_assert(block->GetFirstLIRNode() != nullptr);

/* figure out what jump we have */
Expand Down Expand Up @@ -2928,7 +2928,7 @@ void CodeGen::genTableBasedSwitch(GenTree* treeNode)
// emits the table and an instruction to get the address of the first element
void CodeGen::genJumpTable(GenTree* treeNode)
{
noway_assert(compiler->compCurBB->bbJumpKind == BBJ_SWITCH);
noway_assert(compiler->compCurBB->getBBJumpKind() == BBJ_SWITCH);
assert(treeNode->OperGet() == GT_JMPTABLE);

unsigned jumpCount = compiler->compCurBB->bbJumpSwt->bbsCount;
Expand Down Expand Up @@ -4136,7 +4136,7 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
// A GT_JCMP node is created for an integer-comparison's conditional branch.
void CodeGen::genCodeForJumpCompare(GenTreeOpCC* tree)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);

assert(tree->OperIs(GT_JCMP));
assert(!varTypeIsFloating(tree));
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/jit/codegenriscv64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ void CodeGen::genFnEpilog(BasicBlock* block)
{
SetHasTailCalls(true);

noway_assert(block->bbJumpKind == BBJ_RETURN);
noway_assert(block->getBBJumpKind() == BBJ_RETURN);
noway_assert(block->GetFirstLIRNode() != nullptr);

/* figure out what jump we have */
Expand Down Expand Up @@ -2574,7 +2574,7 @@ void CodeGen::genTableBasedSwitch(GenTree* treeNode)
// emits the table and an instruction to get the address of the first element
void CodeGen::genJumpTable(GenTree* treeNode)
{
noway_assert(compiler->compCurBB->bbJumpKind == BBJ_SWITCH);
noway_assert(compiler->compCurBB->getBBJumpKind() == BBJ_SWITCH);
assert(treeNode->OperGet() == GT_JMPTABLE);

unsigned jumpCount = compiler->compCurBB->bbJumpSwt->bbsCount;
Expand Down Expand Up @@ -3780,7 +3780,7 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
//
void CodeGen::genCodeForJumpCompare(GenTreeOpCC* tree)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);

assert(tree->OperIs(GT_JCMP));
assert(!varTypeIsFloating(tree));
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/jit/codegenxarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ void CodeGen::genEHFinallyOrFilterRet(BasicBlock* block)
}
else
{
assert(block->bbJumpKind == BBJ_EHFILTERRET);
assert(block->getBBJumpKind() == BBJ_EHFILTERRET);

// The return value has already been computed.
instGen_Return(0);
Expand Down Expand Up @@ -1441,7 +1441,7 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
//
void CodeGen::genCodeForJTrue(GenTreeOp* jtrue)
{
assert(compiler->compCurBB->bbJumpKind == BBJ_COND);
assert(compiler->compCurBB->getBBJumpKind() == BBJ_COND);

GenTree* op = jtrue->gtGetOp1();
regNumber reg = genConsumeReg(op);
Expand Down Expand Up @@ -4263,7 +4263,7 @@ void CodeGen::genTableBasedSwitch(GenTree* treeNode)
// emits the table and an instruction to get the address of the first element
void CodeGen::genJumpTable(GenTree* treeNode)
{
noway_assert(compiler->compCurBB->bbJumpKind == BBJ_SWITCH);
noway_assert(compiler->compCurBB->getBBJumpKind() == BBJ_SWITCH);
assert(treeNode->OperGet() == GT_JMPTABLE);

unsigned jumpCount = compiler->compCurBB->bbJumpSwt->bbsCount;
Expand Down Expand Up @@ -10241,7 +10241,7 @@ void CodeGen::genFnEpilog(BasicBlock* block)

if (jmpEpilog)
{
noway_assert(block->bbJumpKind == BBJ_RETURN);
noway_assert(block->getBBJumpKind() == BBJ_RETURN);
noway_assert(block->GetFirstLIRNode());

// figure out what jump we have
Expand Down
5 changes: 3 additions & 2 deletions src/coreclr/jit/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5275,7 +5275,8 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
}

// If there is an unconditional jump (which is not part of callf/always pair)
if (opts.compJitHideAlignBehindJmp && (block->bbJumpKind == BBJ_ALWAYS) && !block->isBBCallAlwaysPairTail())
if (opts.compJitHideAlignBehindJmp && (block->getBBJumpKind() == BBJ_ALWAYS) &&
!block->isBBCallAlwaysPairTail())
{
// Track the lower weight blocks
if (block->bbWeight < minBlockSoFar)
Expand All @@ -5300,7 +5301,7 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
bool unmarkedLoopAlign = false;

#if FEATURE_EH_CALLFINALLY_THUNKS
if (block->bbJumpKind == BBJ_CALLFINALLY)
if (block->getBBJumpKind() == BBJ_CALLFINALLY)
{
// It must be a retless BBJ_CALLFINALLY if we get here.
assert(!block->isBBCallAlwaysPair());
Expand Down
12 changes: 6 additions & 6 deletions src/coreclr/jit/compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ BasicBlockVisit BasicBlock::VisitAllSuccs(Compiler* comp, TFunc func)

for (BasicBlock* bcall = begBlk; bcall != endBlk; bcall = bcall->bbNext)
{
if ((bcall->bbJumpKind != BBJ_CALLFINALLY) || (bcall->bbJumpDest != finBeg))
if ((bcall->getBBJumpKind() != BBJ_CALLFINALLY) || (bcall->bbJumpDest != finBeg))
{
continue;
}
Expand All @@ -649,7 +649,7 @@ BasicBlockVisit BasicBlock::VisitAllSuccs(Compiler* comp, TFunc func)

for (BasicBlock* bcall = begBlk; bcall != endBlk; bcall = bcall->bbNext)
{
if ((bcall->bbJumpKind != BBJ_CALLFINALLY) || (bcall->bbJumpDest != finBeg))
if ((bcall->getBBJumpKind() != BBJ_CALLFINALLY) || (bcall->bbJumpDest != finBeg))
{
continue;
}
Expand Down Expand Up @@ -769,7 +769,7 @@ BasicBlockVisit BasicBlock::VisitRegularSuccs(Compiler* comp, TFunc func)

for (BasicBlock* bcall = begBlk; bcall != endBlk; bcall = bcall->bbNext)
{
if ((bcall->bbJumpKind != BBJ_CALLFINALLY) || (bcall->bbJumpDest != finBeg))
if ((bcall->getBBJumpKind() != BBJ_CALLFINALLY) || (bcall->bbJumpDest != finBeg))
{
continue;
}
Expand Down Expand Up @@ -3125,7 +3125,7 @@ inline bool Compiler::fgIsThrowHlpBlk(BasicBlock* block)
return false;
}

if (!(block->bbFlags & BBF_INTERNAL) || block->bbJumpKind != BBJ_THROW)
if (!(block->bbFlags & BBF_INTERNAL) || block->getBBJumpKind() != BBJ_THROW)
{
return false;
}
Expand Down Expand Up @@ -3224,7 +3224,7 @@ inline void Compiler::fgConvertBBToThrowBB(BasicBlock* block)
fgRemoveBlockAsPred(block);

// Update jump kind after the scrub.
block->bbJumpKind = BBJ_THROW;
block->setBBJumpKind(BBJ_THROW DEBUG_ARG(this));

// Any block with a throw is rare
block->bbSetRunRarely();
Expand All @@ -3236,7 +3236,7 @@ inline void Compiler::fgConvertBBToThrowBB(BasicBlock* block)
if (isCallAlwaysPair)
{
BasicBlock* leaveBlk = block->bbNext;
noway_assert(leaveBlk->bbJumpKind == BBJ_ALWAYS);
noway_assert(leaveBlk->getBBJumpKind() == BBJ_ALWAYS);

// leaveBlk is now unreachable, so scrub the pred lists.
leaveBlk->bbFlags &= ~BBF_DONT_REMOVE;
Expand Down
Loading