Merge pull request #5171 from swiftwasm/katei/merge-release-5.8-2023-01-11

kateinoigakukun · web-flow · commit 3fa209193fd2 · 2023-01-12T03:08:53.000+09:00
Merge release/5.8 2023-01-11
diff --git a/lib/SILOptimizer/Transforms/DeadCodeElimination.cpp b/lib/SILOptimizer/Transforms/DeadCodeElimination.cpp
@@ -283,37 +283,33 @@ void DCE::markLive() {
         break;
       }
       case SILInstructionKind::BeginBorrowInst: {
-        // Currently we only support borrows of owned values.
-        // Nested borrow handling can be complex in the presence of reborrows.
-        // So it is not handled currently.
         auto *borrowInst = cast<BeginBorrowInst>(&I);
+        // Populate guaranteedPhiDependencies for this borrowInst
+        findGuaranteedPhiDependencies(BorrowedValue(borrowInst));
+        auto disableBorrowDCE = [&](SILValue borrow) {
+          visitTransitiveEndBorrows(borrow, [&](EndBorrowInst *endBorrow) {
+            markInstructionLive(endBorrow);
+          });
+        };
+        // If we have a begin_borrow of a @guaranteed operand, disable DCE'ing
+        // of parent borrow scopes. Dead reborrows needs complex handling, whuch
+        // is why it is disabled for now.
         if (borrowInst->getOperand()->getOwnershipKind() ==
             OwnershipKind::Guaranteed) {
-          // Visit the end_borrows of all the borrow scopes that this
-          // begin_borrow could be borrowing.
           SmallVector<SILValue, 4> roots;
           findGuaranteedReferenceRoots(borrowInst->getOperand(),
                                        /*lookThroughNestedBorrows=*/false,
                                        roots);
+          // Visit the end_borrows of all the borrow scopes that this
+          // begin_borrow could be borrowing, and mark them live.
           for (auto root : roots) {
-            visitTransitiveEndBorrows(root,
-                                      [&](EndBorrowInst *endBorrow) {
-                                        markInstructionLive(endBorrow);
-                                      });
+            disableBorrowDCE(root);
           }
-          continue;
         }
-        // Populate guaranteedPhiDependencies for this borrow
-        findGuaranteedPhiDependencies(BorrowedValue(borrowInst));
-        // Don't optimize a borrow scope if it is lexical or has a pointer
-        // escape.
+        // If we have a lexical borrow scope or a pointer escape, disable DCE.
         if (borrowInst->isLexical() ||
             hasPointerEscape(BorrowedValue(borrowInst))) {
-          // Visit all end_borrows and mark them live
-          visitTransitiveEndBorrows(borrowInst, [&](EndBorrowInst *endBorrow) {
-            markInstructionLive(endBorrow);
-          });
-          continue;
+          disableBorrowDCE(borrowInst);
         }
         break;
       }
diff --git a/stdlib/public/BackDeployConcurrency/TaskCancellation.swift b/stdlib/public/BackDeployConcurrency/TaskCancellation.swift
@@ -46,9 +46,14 @@ public func withTaskCancellationHandler<T>(
   // unconditionally add the cancellation record to the task.
   // if the task was already cancelled, it will be executed right away.
   let record = _taskAddCancellationHandler(handler: handler)
-  defer { _taskRemoveCancellationHandler(record: record) }
-
-  return try await operation()
+  do {
+    let result = try await operation()
+    _taskRemoveCancellationHandler(record: record)
+    return result
+  } catch {
+    _taskRemoveCancellationHandler(record: record)
+    throw error
+  }
 }
 
 @available(SwiftStdlib 5.1, *)
diff --git a/stdlib/public/BackDeployConcurrency/TaskLocal.swift b/stdlib/public/BackDeployConcurrency/TaskLocal.swift
@@ -145,9 +145,14 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
     _checkIllegalTaskLocalBindingWithinWithTaskGroup(file: file, line: line)
 
     _taskLocalValuePush(key: key, value: valueDuringOperation)
-    defer { _taskLocalValuePop() }
-
-    return try await operation()
+    do {
+      let result = try await operation()
+      _taskLocalValuePop()
+      return result
+    } catch {
+      _taskLocalValuePop()
+      throw error
+    }
   }
 
   /// Binds the task-local to the specific value for the duration of the
diff --git a/stdlib/public/Concurrency/TaskCancellation.swift b/stdlib/public/Concurrency/TaskCancellation.swift
@@ -46,9 +46,14 @@ public func withTaskCancellationHandler<T>(
   // unconditionally add the cancellation record to the task.
   // if the task was already cancelled, it will be executed right away.
   let record = _taskAddCancellationHandler(handler: handler)
-  defer { _taskRemoveCancellationHandler(record: record) }
-
-  return try await operation()
+  do {
+    let result = try await operation()
+    _taskRemoveCancellationHandler(record: record)
+    return result
+  } catch {
+    _taskRemoveCancellationHandler(record: record)
+    throw error
+  }
 }
 
 @available(SwiftStdlib 5.1, *)
diff --git a/stdlib/public/Concurrency/TaskLocal.swift b/stdlib/public/Concurrency/TaskLocal.swift
@@ -145,9 +145,14 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
     _checkIllegalTaskLocalBindingWithinWithTaskGroup(file: file, line: line)
 
     _taskLocalValuePush(key: key, value: valueDuringOperation)
-    defer { _taskLocalValuePop() }
-
-    return try await operation()
+    do {
+      let result = try await operation()
+      _taskLocalValuePop()
+      return result
+    } catch {
+      _taskLocalValuePop()
+      throw error
+    }
   }
 
   /// Binds the task-local to the specific value for the duration of the
diff --git a/stdlib/public/core/StringGraphemeBreaking.swift b/stdlib/public/core/StringGraphemeBreaking.swift
@@ -407,7 +407,7 @@ extension Unicode.Scalar {
   }
 }
 
-internal struct _GraphemeBreakingState {
+internal struct _GraphemeBreakingState: Sendable, Equatable {
   // When we're looking through an indic sequence, one of the requirements is
   // that there is at LEAST 1 Virama present between two linking consonants.
   // This value helps ensure that when we ultimately need to decide whether or
@@ -436,6 +436,18 @@ internal struct _GraphemeBreakingState {
   var shouldBreakRI = false
 }
 
+extension _GraphemeBreakingState: CustomStringConvertible {
+  var description: String {
+    var r = "["
+    if hasSeenVirama { r += "V" }
+    if isInEmojiSequence { r += "E" }
+    if isInIndicSequence { r += "I" }
+    if shouldBreakRI { r += "R" }
+    r += "]"
+    return r
+  }
+}
+
 extension Unicode {
   /// A state machine for recognizing character (i.e., extended grapheme
   /// cluster) boundaries in an arbitrary series of Unicode scalars.
@@ -448,7 +460,7 @@ extension Unicode {
   /// `String` splits its contents into `Character` values.
   @available(SwiftStdlib 5.8, *)
   public // SPI(Foundation) FIXME: We need API for this
-  struct _CharacterRecognizer {
+  struct _CharacterRecognizer: Sendable {
     internal var _previous: Unicode.Scalar
     internal var _state: _GraphemeBreakingState
 
@@ -547,6 +559,21 @@ extension Unicode {
   }
 }
 
+@available(SwiftStdlib 5.8, *)
+extension Unicode._CharacterRecognizer: Equatable {
+  public static func ==(left: Self, right: Self) -> Bool {
+    left._previous == right._previous && left._state == right._state
+  }
+}
+
+@available(SwiftStdlib 5.8, *)
+extension Unicode._CharacterRecognizer: CustomStringConvertible {
+  public var description: String {
+    return "\(_state)U+\(String(_previous.value, radix: 16, uppercase: true))"
+  }
+}
+
+
 extension _StringGuts {
   // Returns the stride of the grapheme cluster starting at offset `index`,
   // assuming it is on a grapheme cluster boundary.
diff --git a/test/SILOptimizer/dead_code_elimination_nontrivial_ossa.sil b/test/SILOptimizer/dead_code_elimination_nontrivial_ossa.sil
@@ -529,6 +529,48 @@ bb1(%newborrowi : @guaranteed $Klass, %newborrowo : @guaranteed $Klass):
   return %res : $()
 }
 
+
+sil [ossa] @dce_nestedborrowlifetime4 : $@convention(thin) (@guaranteed Wrapper1, @guaranteed Wrapper1) -> () {
+bb0(%0 : @guaranteed $Wrapper1, %1 : @guaranteed $Wrapper1):
+  cond_br undef, bb1, bb2
+
+bb1:
+  %outer1 = begin_borrow %0 : $Wrapper1
+  %ex1 = struct_extract %outer1 : $Wrapper1, #Wrapper1.val1
+  %ex11 = struct_extract %ex1 : $Wrapper2, #Wrapper2.val2
+  br bb3(%ex11 : $Klass, %outer1 : $Wrapper1)
+
+bb2:
+  %outer2 = begin_borrow %1 : $Wrapper1
+  %ex2 = struct_extract %outer2 : $Wrapper1, #Wrapper1.val1
+  %ex21 = struct_extract %ex2 : $Wrapper2, #Wrapper2.val2
+  br bb3(%ex21 : $Klass, %outer2 : $Wrapper1)
+
+bb3(%phi1 : @guaranteed $Klass, %phi2 : @guaranteed $Wrapper1):
+  %f = function_ref @use_klass : $@convention(thin) (@guaranteed Klass) -> ()
+  apply %f(%phi1) : $@convention(thin) (@guaranteed Klass) -> ()
+  end_borrow %phi2 : $Wrapper1
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil [ossa] @dce_nestedborrowlifetime5 : $@convention(thin) (@guaranteed Wrapper1) -> () {
+bb0(%0 : @guaranteed $Wrapper1):
+  %outer1 = begin_borrow %0 : $Wrapper1
+  %inner1 = begin_borrow %outer1 : $Wrapper1
+  %ex1 = struct_extract %inner1 : $Wrapper1, #Wrapper1.val1
+  %ex11 = struct_extract %ex1 : $Wrapper2, #Wrapper2.val2
+  br bb2(%ex11 : $Klass, %inner1 : $Wrapper1)
+
+bb2(%phi1 : @guaranteed $Klass, %phi2 : @guaranteed $Wrapper1):
+  %f = function_ref @use_klass : $@convention(thin) (@guaranteed Klass) -> ()
+  apply %f(%phi1) : $@convention(thin) (@guaranteed Klass) -> ()
+  end_borrow %phi2 : $Wrapper1
+  end_borrow %outer1 : $Wrapper1
+  %9999 = tuple()
+  return %9999 : $()
+}
+
 // CHECK-LABEL: sil [ossa] @infinite_loop :
 // CHECK-NOT: copy_value
 // CHECK-LABEL: } // end sil function 'infinite_loop'
diff --git a/test/stdlib/CharacterRecognizer.swift b/test/stdlib/CharacterRecognizer.swift
@@ -114,3 +114,36 @@ if #available(SwiftStdlib 5.8, *) {
       """)
   }
 }
+
+if #available(SwiftStdlib 5.8, *) {
+  suite.test("Equatable") {
+    var r1 = Unicode._CharacterRecognizer()
+    var r2 = Unicode._CharacterRecognizer()
+    expectEqual(r1, r2)
+    expectTrue(r1.hasBreak(before: "a"))
+    expectNotEqual(r1, r2)
+    expectTrue(r2.hasBreak(before: "a"))
+    expectEqual(r1, r2)
+    expectTrue(r2.hasBreak(before: "\u{1f44f}")) // CLAPPING HANDS SIGN
+    expectNotEqual(r1, r2)
+    expectTrue(r1.hasBreak(before: "b"))
+    expectNotEqual(r1, r2)
+    expectFalse(r2.hasBreak(before: "\u{1f3fc}")) // EMOJI MODIFIER FITZPATRICK TYPE-3
+    expectNotEqual(r1, r2)
+    expectTrue(r2.hasBreak(before: "b"))
+    expectEqual(r1, r2) // breaks should reset state
+  }
+}
+
+if #available(SwiftStdlib 5.8, *) {
+  suite.test("CustomStringConvertible") {
+    var r = Unicode._CharacterRecognizer()
+    expectEqual("\(r)", "[]U+0")
+    expectTrue(r.hasBreak(before: "\u{1F1FA}")) // REGIONAL INDICATOR SYMBOL LETTER U
+    expectEqual("\(r)", "[]U+1F1FA")
+    expectFalse(r.hasBreak(before: "\u{1F1F8}")) // REGIONAL INDICATOR SYMBOL LETTER S
+    expectEqual("\(r)", "[R]U+1F1F8")
+    expectTrue(r.hasBreak(before: "$"))
+    expectEqual("\(r)", "[]U+24")
+  }
+}
diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json
@@ -98,7 +98,7 @@
                 "swift-argument-parser": "1.0.3",
                 "swift-atomics": "1.0.2",
                 "swift-collections": "1.0.1",
-                "swift-crypto": "1.1.5",
+                "swift-crypto": "2.2.3",
                 "swift-driver": "main",
                 "swift-numerics": "1.0.1",
                 "swift-syntax": "main",
@@ -141,7 +141,7 @@
                 "swift-argument-parser": "1.0.3",
                 "swift-atomics": "1.0.2",
                 "swift-collections": "1.0.1",
-                "swift-crypto": "1.1.5",
+                "swift-crypto": "2.2.3",
                 "swift-driver": "release/5.8",
                 "swift-numerics": "1.0.1",
                 "swift-syntax": "release/5.8",
@@ -183,7 +183,7 @@
                 "swift-argument-parser": "1.0.3",
                 "swift-atomics": "1.0.2",
                 "swift-collections": "1.0.1",
-                "swift-crypto": "1.1.5",
+                "swift-crypto": "2.2.3",
                 "swift-driver": "main",
                 "swift-numerics": "1.0.1",
                 "swift-syntax": "main",
@@ -225,7 +225,7 @@
                 "swift-argument-parser": "1.0.3",
                 "swift-atomics": "1.0.2",
                 "swift-collections": "1.0.1",
-                "swift-crypto": "1.1.5",
+                "swift-crypto": "2.2.3",
                 "swift-driver": "main",
                 "swift-numerics": "1.0.1",
                 "swift-syntax": "main",
@@ -267,7 +267,7 @@
                 "swift-argument-parser": "1.0.3",
                 "swift-atomics": "1.0.2",
                 "swift-collections": "1.0.1",
-                "swift-crypto": "1.1.5",
+                "swift-crypto": "2.2.3",
                 "swift-driver": "release/5.8",
                 "swift-numerics": "1.0.1",
                 "swift-syntax": "release/5.8",
@@ -510,7 +510,7 @@
                 "swift-argument-parser": "1.0.3",
                 "swift-atomics": "1.0.2",
                 "swift-collections": "1.0.1",                
-                "swift-crypto": "1.1.5",                
+                "swift-crypto": "2.2.3",                
                 "swift-driver": "main",
                 "swift-numerics": "1.0.1",
                 "swift-syntax": "main",
