@@ -1357,7 +1357,7 @@ void SsaBuilder::BlockRenameVariables(BasicBlock* block)
1357
1357
void SsaBuilder::AddPhiArgsToSuccessors (BasicBlock* block)
1358
1358
{
1359
1359
block->VisitAllSuccs (m_pCompiler, [this , block](BasicBlock* succ) {
1360
- #if defined( TARGET_WASM)
1360
+ #ifdef TARGET_WASM
1361
1361
if (block->IsLIR ())
1362
1362
{
1363
1363
for (GenTree* tree : LIR::AsRange (succ))
@@ -1372,40 +1372,34 @@ void SsaBuilder::AddPhiArgsToSuccessors(BasicBlock* block)
1372
1372
continue ; // skip the Phi nodes
1373
1373
}
1374
1374
1375
- unsigned lclNum = tree->AsLclVarCommon ()->GetLclNum ();
1376
- GenTreePhi* phi = tree->gtGetOp1 ()->AsPhi ();
1375
+ unsigned lclNum = tree->AsLclVar ()->GetLclNum ();
1376
+ GenTreePhi* phi = tree->AsLclVar ()-> Data ()->AsPhi ();
1377
1377
unsigned ssaNum = m_renameStack.Top (lclNum);
1378
1378
1379
1379
AddPhiArg (succ, nullptr /* no statements in LIR form */ , phi, lclNum, ssaNum, block);
1380
1380
}
1381
1381
}
1382
1382
else
1383
+ #endif // TARGET_WASM
1383
1384
{
1384
- #endif
1385
1385
// Walk the statements for phi nodes.
1386
1386
for (Statement* const stmt : succ->Statements ())
1387
1387
{
1388
- // Walk the statements for phi nodes.
1389
- for (Statement* const stmt : succ->Statements ())
1388
+ // A prefix of the statements of the block are phi definition nodes. If we complete processing
1389
+ // that prefix, exit.
1390
+ if (!stmt->IsPhiDefnStmt ())
1390
1391
{
1391
- // A prefix of the statements of the block are phi definition nodes. If we complete processing
1392
- // that prefix, exit.
1393
- if (!stmt->IsPhiDefnStmt ())
1394
- {
1395
- break ;
1396
- }
1392
+ break ;
1393
+ }
1397
1394
1398
- GenTreeLclVar* store = stmt->GetRootNode ()->AsLclVar ();
1399
- GenTreePhi* phi = store->Data ()->AsPhi ();
1400
- unsigned lclNum = store->GetLclNum ();
1401
- unsigned ssaNum = m_renameStack.Top (lclNum);
1395
+ GenTreeLclVar* store = stmt->GetRootNode ()->AsLclVar ();
1396
+ GenTreePhi* phi = store->Data ()->AsPhi ();
1397
+ unsigned lclNum = store->GetLclNum ();
1398
+ unsigned ssaNum = m_renameStack.Top (lclNum);
1402
1399
1403
- AddPhiArg (succ, stmt, phi, lclNum, ssaNum, block);
1404
- }
1400
+ AddPhiArg (succ, stmt, phi, lclNum, ssaNum, block);
1405
1401
}
1406
- #if defined(TARGET_WASM)
1407
1402
}
1408
- #endif
1409
1403
1410
1404
// Now handle memory.
1411
1405
for (MemoryKind memoryKind : allMemoryKinds ())
0 commit comments