From 60cb043cea825dc2b673a5468f9555ed5afcede8 Mon Sep 17 00:00:00 2001 From: "Aman Khalid (from Dev Box)" Date: Thu, 14 Mar 2024 17:03:55 -0400 Subject: [PATCH] Remove last BBF_NONE_QUIRK check --- src/coreclr/jit/fgopt.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/coreclr/jit/fgopt.cpp b/src/coreclr/jit/fgopt.cpp index ef1cb13d928b6d..b2b9ca6b3953aa 100644 --- a/src/coreclr/jit/fgopt.cpp +++ b/src/coreclr/jit/fgopt.cpp @@ -4867,9 +4867,8 @@ bool Compiler::fgUpdateFlowGraph(bool doTailDuplication /* = false */, bool isPh if (bDest->KindIs(BBJ_ALWAYS) && !bDest->TargetIs(bDest) && // special case for self jumps bDest->isEmpty()) { - // TODO: Allow optimizing branches to blocks that jump to the next block - const bool optimizeBranch = !bDest->JumpsToNext() || !bDest->HasFlag(BBF_NONE_QUIRK); - if (optimizeBranch && fgOptimizeBranchToEmptyUnconditional(block, bDest)) + // Empty blocks that jump to the next block can probably be compacted instead + if (!bDest->JumpsToNext() && fgOptimizeBranchToEmptyUnconditional(block, bDest)) { change = true; modified = true;