JIT: Don't convert unreachable BBJ_CALLFINALLYRET blocks to BBJ_THROW…

… during morph (#109519)
dotnet · Nov 5, 2024 · 33af1a2 · 33af1a2
1 parent 9ef212c
commit 33af1a2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -13379,12 +13379,11 @@ void Compiler::fgMorphBlock(BasicBlock* block, MorphUnreachableInfo* unreachable
                     unreachableInfo->SetUnreachable(block);
 
                     // Remove the block's IR and flow edges but don't mark the block as removed.
-                    // Convert to BBJ_THROW. But leave CALLFINALLY alone.
+                    // Convert to BBJ_THROW. But leave CALLFINALLY(RET) alone.
                     //
                     // If we clear out the block, there is nothing to morph, so just return.
                     //
-                    bool const isCallFinally = block->KindIs(BBJ_CALLFINALLY);
-                    if (!isCallFinally)
+                    if (!block->KindIs(BBJ_CALLFINALLY, BBJ_CALLFINALLYRET))
                     {
                         fgUnreachableBlock(block);
                         block->RemoveFlags(BBF_REMOVED);