From ac90d1c78c2fae48e88f160d9471a6bea67e4e79 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 13 Jun 2023 16:39:15 +0200 Subject: [PATCH] try a new fix for it --- debian/patches/workaround-bug-63225.diff | 33 ++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/debian/patches/workaround-bug-63225.diff b/debian/patches/workaround-bug-63225.diff index 94f41f5a..6f69b289 100644 --- a/debian/patches/workaround-bug-63225.diff +++ b/debian/patches/workaround-bug-63225.diff @@ -1,13 +1,20 @@ -Index: llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c/llvm/lib/CodeGen/MachineScheduler.cpp -=================================================================== ---- llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c.orig/llvm/lib/CodeGen/MachineScheduler.cpp -+++ llvm-toolchain-snapshot_17~++20230610085902+8e44b849da1c/llvm/lib/CodeGen/MachineScheduler.cpp -@@ -2813,7 +2813,7 @@ LLVM_DUMP_METHOD void SchedBoundary::dum - dbgs() << ResName << "(" << UnitIdx << ") = "; - if (SchedModel && SchedModel->enableIntervals()) { - if (ReservedResourceSegments.count(StartIdx + UnitIdx)) -- dbgs() << ReservedResourceSegments.at(StartIdx + UnitIdx); -+ dbgs() << "ReservedResourceSegments.at(StartIdx + UnitIdx)"; - else - dbgs() << "{ }\n"; - } else +diff --git a/llvm/include/llvm/CodeGen/MachineScheduler.h b/llvm/include/llvm/CodeGen/MachineScheduler.h +--- a/llvm/include/llvm/CodeGen/MachineScheduler.h ++++ b/llvm/include/llvm/CodeGen/MachineScheduler.h +@@ -815,7 +815,6 @@ + const ResourceSegments &c2) { + return c1._Intervals == c2._Intervals; + } +-#ifndef NDEBUG + friend llvm::raw_ostream &operator<<(llvm::raw_ostream &os, + const ResourceSegments &Segments) { + os << "{ "; +@@ -824,7 +823,6 @@ + os << "}\n"; + return os; + } +-#endif + }; + + /// Each Scheduling boundary is associated with ready queues. It tracks the +