Fix merge conflict

src/coreclr/jit/fgbasic.cpp

@@ -5537,8 +5537,8 @@ BasicBlock* Compiler::fgConnectFallThrough(BasicBlock* bSrc, BasicBlock* bDst)
                     break;
             }
         }
-        else if (bSrc->KindIs(BBJ_ALWAYS) && ((bSrc->bbFlags & BBF_KEEP_BBJ_ALWAYS) == 0) && bSrc->HasJump() &&
-                 bSrc->JumpsToNext())
+        else if (bSrc->KindIs(BBJ_ALWAYS) && ((bSrc->bbFlags & BBF_KEEP_BBJ_ALWAYS) == 0) &&
+                 bSrc->HasInitializedJumpDest() && bSrc->JumpsToNext())
         {
             bSrc->bbFlags |= BBF_NONE_QUIRK;
         }

src/coreclr/jit/fgehopt.cpp

@@ -1077,7 +1077,8 @@ PhaseStatus Compiler::fgCloneFinally()
             newBlock->clearHndIndex();
 
             // Jump dests are set in a post-pass; make sure CloneBlockState hasn't tried to set them.
-            assert(newBlock->KindIs(BBJ_NONE));
+            assert(newBlock->KindIs(BBJ_ALWAYS));
+            assert(!newBlock->HasInitializedJumpDest());
         }
 
         if (!clonedOk)
@@ -1101,7 +1102,7 @@ PhaseStatus Compiler::fgCloneFinally()
             BasicBlock* newBlock = blockMap[block];
             // Jump kind/target should not be set yet
             assert(newBlock->KindIs(BBJ_ALWAYS));
-            assert(!newBlock->HasJump());
+            assert(!newBlock->HasInitializedJumpDest());
 
             if (block->KindIs(BBJ_EHFINALLYRET))
             {

src/coreclr/jit/loopcloning.cpp

@@ -2191,7 +2191,7 @@ void Compiler::optCloneLoop(unsigned loopInd, LoopCloneContext* context)
         assert(b && newblk != nullptr);
 
         // Jump target should not be set yet
-        assert(!newblk->HasJump());
+        assert(!newblk->HasInitializedJumpDest());
 
         // First copy the jump destination(s) from "blk".
         optCopyBlkDest(blk, newblk);
@@ -2265,7 +2265,7 @@ void Compiler::optCloneLoop(unsigned loopInd, LoopCloneContext* context)
 
     // We haven't set the jump target yet
     assert(slowHead->KindIs(BBJ_ALWAYS));
-    assert(!slowHead->HasJump());
+    assert(!slowHead->HasInitializedJumpDest());
     slowHead->SetJumpDest(e2);
 
     fgAddRefPred(e2, slowHead);

src/coreclr/jit/optimizer.cpp

@@ -4394,7 +4394,8 @@ PhaseStatus Compiler::optUnrollLoops()
                     newBlock->scaleBBWeight(1.0 / BB_LOOP_WEIGHT_SCALE);
 
                     // Jump dests are set in a post-pass; make sure CloneBlockState hasn't tried to set them.
-                    assert(newBlock->KindIs(BBJ_NONE));
+                    assert(newBlock->KindIs(BBJ_ALWAYS));
+                    assert(!newBlock->HasInitializedJumpDest());
 
                     if (block == bottom)
                     {
@@ -4423,7 +4424,7 @@ PhaseStatus Compiler::optUnrollLoops()
                 {
                     // Jump kind/target should not be set yet
                     BasicBlock* newBlock = blockMap[block];
-                    assert(!newBlock->HasJump());
+                    assert(!newBlock->HasInitializedJumpDest());
 
                     // Now copy the jump kind/target
                     optCopyBlkDest(block, newBlock);
@@ -4440,7 +4441,7 @@ PhaseStatus Compiler::optUnrollLoops()
 
                 if (clonedTopPrev->KindIs(BBJ_ALWAYS))
                 {
-                    assert(!clonedTopPrev->HasJump());
+                    assert(!clonedTopPrev->HasInitializedJumpDest());
                     clonedTopPrev->SetJumpDest(clonedTop);
                 }
 
@@ -4571,7 +4572,7 @@ PhaseStatus Compiler::optUnrollLoops()
             {
                 BasicBlock* clonedBottom = blockMap[bottom];
                 assert(clonedBottom->KindIs(BBJ_ALWAYS));
-                assert(!clonedBottom->HasJump());
+                assert(!clonedBottom->HasInitializedJumpDest());
 
                 clonedBottom->SetJumpDest(tail);
                 fgAddRefPred(tail, clonedBottom);