Update the place where we assert about align presence while removing jump to next instr (#95845)

kunalspathak · web-flow · commit acc3f0cea405 · 2023-12-13T11:54:06.000-08:00
* Move the assert about align in proper place

* remove extra check for removable jump

* fix merge conflict
diff --git a/src/coreclr/jit/codegenlinear.cpp b/src/coreclr/jit/codegenlinear.cpp
@@ -744,11 +744,8 @@ void CodeGen::genCodeForBBlist()
                     break;
                 }
 #ifdef TARGET_XARCH
-                // If a block was selected to place an alignment instruction because it ended
-                // with a jump, do not remove jumps from such blocks.
                 // Do not remove a jump between hot and cold regions.
-                bool isRemovableJmpCandidate =
-                    !block->hasAlign() && !compiler->fgInDifferentRegions(block, block->GetTarget());
+                bool isRemovableJmpCandidate = !compiler->fgInDifferentRegions(block, block->GetTarget());
 
                 inst_JMP(EJ_jmp, block->GetTarget(), isRemovableJmpCandidate);
 #else
diff --git a/src/coreclr/jit/emit.cpp b/src/coreclr/jit/emit.cpp
@@ -4632,7 +4632,6 @@ void emitter::emitRemoveJumpToNextInst()
 #if DEBUG
             assert(jmp->idInsFmt() == IF_LABEL);
             assert(emitIsUncondJump(jmp));
-            assert((jmpGroup->igFlags & IGF_HAS_ALIGN) == 0);
             assert((jmpGroup->igNum > previousJumpIgNum) || (previousJumpIgNum == (UNATIVE_OFFSET)-1) ||
                    ((jmpGroup->igNum == previousJumpIgNum) && (jmp->idDebugOnlyInfo()->idNum > previousJumpInsNum)));
             previousJumpIgNum  = jmpGroup->igNum;
@@ -4646,6 +4645,8 @@ void emitter::emitRemoveJumpToNextInst()
 
             if ((jmpGroup->igNext == targetGroup) && ((jmpGroup->igFlags & IGF_HAS_REMOVABLE_JMP) != 0))
             {
+                assert(!jmpGroup->endsWithAlignInstr());
+
                 // the last instruction in the group is the jmp we're looking for
                 // and it jumps to the next instruction group so we don't need it
                 CLANG_FORMAT_COMMENT_ANCHOR
@@ -4736,11 +4737,6 @@ void emitter::emitRemoveJumpToNextInst()
                     JITDUMP("IG%02u IN%04x jump target is not set!, keeping.\n", jmpGroup->igNum,
                             jmp->idDebugOnlyInfo()->idNum);
                 }
-                else if ((jmpGroup->igFlags & IGF_HAS_ALIGN) != 0)
-                {
-                    JITDUMP("IG%02u IN%04x containing instruction group has alignment, keeping.\n", jmpGroup->igNum,
-                            jmp->idDebugOnlyInfo()->idNum);
-                }
                 else if (jmpGroup->igNext != targetGroup)
                 {
                     JITDUMP("IG%02u IN%04x does not jump to the next instruction group, keeping.\n", jmpGroup->igNum,
@@ -4752,6 +4748,11 @@ void emitter::emitRemoveJumpToNextInst()
                             "keeping.\n",
                             jmpGroup->igNum, jmp->idDebugOnlyInfo()->idNum);
                 }
+                else if (jmpGroup->endsWithAlignInstr())
+                {
+                    JITDUMP("IG%02u IN%04x containing instruction group has alignment, keeping.\n", jmpGroup->igNum,
+                            jmp->idDebugOnlyInfo()->idNum);
+                }
 #endif // DEBUG
             }
         }
