Skip to content

Commit 9792586

Browse files
committed
* add and check assert(m_doElseConversion) in CI
1 parent ada445d commit 9792586

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/coreclr/jit/ifconversion.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ bool OptIfConversionDsc::IfConvertCheckFlow()
8484
m_finalBlock = m_doElseConversion ? trueBb->GetUniqueSucc() : trueBb;
8585
m_mainOper = GT_STORE_LCL_VAR;
8686

87-
if (m_doElseConversion && m_finalBlock == nullptr)
87+
if (m_finalBlock == nullptr)
8888
{
89+
assert(m_doElseConversion);
8990
if (falseBb->KindIs(BBJ_RETURN) && trueBb->KindIs(BBJ_RETURN))
9091
{
9192
m_mainOper = GT_RETURN;
@@ -188,10 +189,10 @@ void OptIfConversionDsc::IfConvertDump()
188189
// Then & Else only exist before the transformation
189190
if (m_startBlock->KindIs(BBJ_COND))
190191
{
191-
m_compiler->fgDumpBlock(m_startBlock->GetFalseTarget());
192+
m_compiler->fgDumpBlock(m_thenOperation.block);
192193
if (m_doElseConversion)
193194
{
194-
m_compiler->fgDumpBlock(m_startBlock->GetTrueTarget());
195+
m_compiler->fgDumpBlock(m_elseOperation.block);
195196
}
196197
}
197198
}
@@ -356,7 +357,7 @@ bool OptIfConversionDsc::optIfConvert(int* pReachabilityBudget)
356357
return false;
357358
}
358359

359-
if (m_startBlock->StatementCount() == 0)
360+
if (m_startBlock->firstStmt() == nullptr)
360361
{
361362
return false;
362363
}
@@ -372,7 +373,7 @@ bool OptIfConversionDsc::optIfConvert(int* pReachabilityBudget)
372373
{
373374
return false;
374375
}
375-
JITDUMP("valid flow\n");
376+
376377
m_cond = last->gtGetOp1();
377378

378379
// Check the Then and Else blocks have a single operation each.

0 commit comments

Comments
 (0)