Author: Jessica Paquette Date: 2021-01-19T10:38:04-08:00 New Revision: cbf52463599c860243d29877021fcdfcd9d46553
URL: https://github.com/llvm/llvm-project/commit/cbf52463599c860243d29877021fcdfcd9d46553 DIFF: https://github.com/llvm/llvm-project/commit/cbf52463599c860243d29877021fcdfcd9d46553.diff LOG: Fix buildbot after cfc60730179042a93cb9cb338982e71d20707a24 Windows buildbots were not happy with using find_if + instructionsWithoutDebug. In cfc60730179042a9, instructionsWithoutDebug is not technically necessary. So, just iterate over the block directly. http://lab.llvm.org:8011/#/builders/127/builds/4732/steps/7/logs/stdio Added: Modified: llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp Removed: ################################################################################ diff --git a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp index c142c7a70c95..df0219fcfa64 100644 --- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp +++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp @@ -625,13 +625,10 @@ bool CombinerHelper::isPredecessor(const MachineInstr &DefMI, if (&DefMI == &UseMI) return false; const MachineBasicBlock &MBB = *DefMI.getParent(); - auto NonDbgInsts = - instructionsWithoutDebug(MBB.instr_begin(), MBB.instr_end()); - auto DefOrUse = - find_if(NonDbgInsts, [&DefMI, &UseMI](const MachineInstr &MI) { - return &MI == &DefMI || &MI == &UseMI; - }); - if (DefOrUse == NonDbgInsts.end()) + auto DefOrUse = find_if(MBB, [&DefMI, &UseMI](const MachineInstr &MI) { + return &MI == &DefMI || &MI == &UseMI; + }); + if (DefOrUse == MBB.end()) llvm_unreachable("Block must contain both DefMI and UseMI!"); return &*DefOrUse == &DefMI; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
