[llvm] 49d41de - MachineSink: Fix strict weak ordering in GetAllSortedSuccessors

[Fangrui Song via llvm-commits]

Author: Danila Kutenin
Date: 2023-08-02T12:52:55-07:00
New Revision: 49d41de57896e935cd5726719c5208bce22694ae

URL: https://github.com/llvm/llvm-project/commit/49d41de57896e935cd5726719c5208bce22694ae
DIFF: https://github.com/llvm/llvm-project/commit/49d41de57896e935cd5726719c5208bce22694ae.diff

LOG: MachineSink: Fix strict weak ordering in GetAllSortedSuccessors

CodeGen/X86/pseudo_cmov_lower2.ll fails using libc++ debug mode
(D150264) without this change.

Reviewed By: MaskRay, aeubanks

Differential Revision: https://reviews.llvm.org/D155811

Added: 
    

Modified: 
    llvm/lib/CodeGen/MachineSink.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/MachineSink.cpp b/llvm/lib/CodeGen/MachineSink.cpp
index 8da97dc7e74240..57ae7b5660bbc7 100644
--- a/llvm/lib/CodeGen/MachineSink.cpp
+++ b/llvm/lib/CodeGen/MachineSink.cpp
@@ -915,7 +915,7 @@ MachineSinking::GetAllSortedSuccessors(MachineInstr &MI, MachineBasicBlock *MBB,
       AllSuccs, [this](const MachineBasicBlock *L, const MachineBasicBlock *R) {
         uint64_t LHSFreq = MBFI ? MBFI->getBlockFreq(L).getFrequency() : 0;
         uint64_t RHSFreq = MBFI ? MBFI->getBlockFreq(R).getFrequency() : 0;
-        bool HasBlockFreq = LHSFreq != 0 && RHSFreq != 0;
+        bool HasBlockFreq = LHSFreq != 0 || RHSFreq != 0;
         return HasBlockFreq ? LHSFreq < RHSFreq
                             : CI->getCycleDepth(L) < CI->getCycleDepth(R);
       });