Merge commit '67a631b40673' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 0895ae1ac1ec · 2025-03-21T08:00:45.000-07:00
diff --git a/llvm/lib/CodeGen/StackColoring.cpp b/llvm/lib/CodeGen/StackColoring.cpp
@@ -1178,8 +1178,11 @@ void StackColoring::expungeSlotMap(DenseMap<int, int> &SlotRemap,
     if (auto It = SlotRemap.find(i); It != SlotRemap.end()) {
       int Target = It->second;
       // As long as our target is mapped to something else, follow it.
-      while (SlotRemap.count(Target)) {
-        Target = SlotRemap[Target];
+      while (true) {
+        auto It = SlotRemap.find(Target);
+        if (It == SlotRemap.end())
+          break;
+        Target = It->second;
         SlotRemap[i] = Target;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1178,8 +1178,11 @@ void StackColoring::expungeSlotMap(DenseMap<int, int> &SlotRemap,`
`1178`	`1178`	`if (auto It = SlotRemap.find(i); It != SlotRemap.end()) {`
`1179`	`1179`	`int Target = It->second;`
`1180`	`1180`	`// As long as our target is mapped to something else, follow it.`
`1181`		`- while (SlotRemap.count(Target)) {`
`1182`		`- Target = SlotRemap[Target];`
	`1181`	`+ while (true) {`
	`1182`	`+ auto It = SlotRemap.find(Target);`
	`1183`	`+ if (It == SlotRemap.end())`
	`1184`	`+ break;`
	`1185`	`+ Target = It->second;`
`1183`	`1186`	`SlotRemap[i] = Target;`
`1184`	`1187`	`}`
`1185`	`1188`	`}`