Merge pull request #81574 from nate-chandler/cherrypick/release/6.2/rdar151325025

6.2: [MoveOnlyChecker] Don't complete phis.

Author: nate-chandler

lib/SILOptimizer/Mandatory/MoveOnlyChecker.cpp

@@ -122,14 +122,14 @@ void MoveOnlyChecker::checkObjects() {
 
 void MoveOnlyChecker::completeObjectLifetimes(
     ArrayRef<MarkUnresolvedNonCopyableValueInst *> insts) {
-// TODO: Delete once OSSALifetimeCompletion is run as part of SILGenCleanup.
-OSSALifetimeCompletion completion(fn, domTree, *deba->get(fn));
-
-// Collect all values derived from each mark_unresolved_non_copyable_value
-// instruction via ownership instructions and phis.
-ValueWorklist transitiveValues(fn);
-for (auto *inst : insts) {
-  transitiveValues.push(inst);
+  // TODO: Delete once OSSALifetimeCompletion is run as part of SILGenCleanup.
+  OSSALifetimeCompletion completion(fn, domTree, *deba->get(fn));
+
+  // Collect all values derived from each mark_unresolved_non_copyable_value
+  // instruction via ownership instructions and phis.
+  ValueWorklist transitiveValues(fn);
+  for (auto *inst : insts) {
+    transitiveValues.push(inst);
   }
   while (auto value = transitiveValues.pop()) {
     for (auto *use : value->getUses()) {
@@ -163,6 +163,10 @@ for (auto *inst : insts) {
   for (auto *block : poa->get(fn)->getPostOrder()) {
     for (SILInstruction &inst : reverse(*block)) {
       for (auto result : inst.getResults()) {
+        if (llvm::any_of(result->getUsers(),
+                         [](auto *user) { return isa<BranchInst>(user); })) {
+          continue;
+        }
         if (!transitiveValues.isVisited(result))
           continue;
         if (completion.completeOSSALifetime(
@@ -173,7 +177,9 @@ for (auto *inst : insts) {
       }
     }
     for (SILArgument *arg : block->getArguments()) {
-      assert(!arg->isReborrow() && "reborrows not legal at this SIL stage");
+      if (arg->isReborrow()) {
+        continue;
+      }
       if (!transitiveValues.isVisited(arg))
         continue;
       if (completion.completeOSSALifetime(

validation-test/SILOptimizer/gh81515.swift

@@ -0,0 +1,36 @@
+// RUN: %target-build-swift %s
+
+typealias LeagueDayOfWeek = UInt8
+
+let settings = LeagueSettings(divisions: [.init(id: 0, dayOfWeek: 0), .init(id: 1, dayOfWeek: 0)])
+let dummy = Dummy()
+dummy.dummy(settings: settings)
+
+struct LeagueSettings: Codable, Sendable {
+    let divisions:ContiguousArray<LeagueDivision>
+}
+struct LeagueEntry: Codable, Sendable {
+    typealias IDValue = Int
+}
+struct LeagueDivision: Codable, Hashable, Sendable {
+    typealias IDValue = Int
+    let id:IDValue
+    let dayOfWeek:LeagueDayOfWeek
+}
+struct Dummy: ~Copyable {
+}
+extension Dummy {
+    func dummy(settings: LeagueSettings) {
+        var divisionEntries:ContiguousArray<Set<LeagueEntry.IDValue>> = .init(repeating: Set(), count: settings.divisions.count)
+        var grouped:[LeagueDayOfWeek:Set<LeagueEntry.IDValue>] = [:]
+        for division in settings.divisions {
+            /* // OK
+            if grouped[division.dayOfWeek] == nil {
+                grouped[division.dayOfWeek] = divisionEntries[division.id]
+            } else {
+                grouped[division.dayOfWeek]!.formUnion(divisionEntries[division.id])
+            }*/
+            grouped[division.dayOfWeek, default: []].formUnion(divisionEntries[division.id]) // crashes
+        }
+    }
+}