Fixed null dereference errors in SimdCF passes

Fixed null dereference errors in GenXSimdCFConformance and GenXSimdCFRegion
intel · Oct 24, 2023 · 3c8e167 · 3c8e167
1 parent eafef59
commit 3c8e167
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
@@ -4130,11 +4130,12 @@ void GenXLateSimdCFConformance::hoistExtractEMInstructions() {
       else {
         ToRemove.push_back(V);
         V->replaceAllUsesWith(It->second);
-        V->eraseFromParent();
       }
     }
-  for (auto &&V : ToRemove)
+  for (auto &&V : ToRemove) {
     removeFromEMRMVals(V);
+    V->eraseFromParent();
+  }
 }
 
 /***********************************************************************

diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
@@ -1180,11 +1180,11 @@ void GenXPredToSimdCF::insertIfGotoJoin(SimdCFIfRegion *R) {
   if (R->hasElse()) {
     auto *ElseExit = R->getIfThenRegion()->getExit();
     Br = cast<BranchInst>(ElseExit->getTerminator());
+    auto *IfEndBB = IfThenExitBr->getSuccessor(1);
     // 1-th: generate goto(EM, zeroinitializer, zeroinitializer) in the end of
     // then-block
     generateThenGoto(Br, JoinBlock);
 
-    auto *IfEndBB = IfThenExitBr->getSuccessor(1);
     for (auto &PHI : IfEndBB->phis()) {
       PHI.replaceIncomingBlockWith(IfThenExit, JoinBlock);
     }