Merge branch 'main' into tbkka-assertions2

Author: tbkka

CMakeLists.txt

@@ -712,6 +712,10 @@ option(SWIFT_ENABLE_SYNCHRONIZATION
   "Enable build of the Swift Synchronization module"
   FALSE)
 
+option(SWIFT_ENABLE_VOLATILE
+  "Enable build of the Swift Volatile module"
+  FALSE)
+
 option(SWIFT_ENABLE_DISPATCH
   "Enable use of libdispatch"
   TRUE)
@@ -1359,6 +1363,7 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Unicode Support:                    ${SWIFT_STDLIB_ENABLE_UNICODE_DATA}")
   message(STATUS "Observation Support:                ${SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION}")
   message(STATUS "Synchronization Support:            ${SWIFT_ENABLE_SYNCHRONIZATION}")
+  message(STATUS "Volatile Support:                   ${SWIFT_ENABLE_VOLATILE}")
   message(STATUS "")
 else()
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")

SwiftCompilerSources/Sources/Optimizer/Utilities/Devirtualization.swift

@@ -33,7 +33,11 @@ private func devirtualize(destroy: some DevirtualizableDestroy, _ context: some
   if !type.isMoveOnly {
     return true
   }
-  precondition(type.isNominal, "non-copyable non-nominal types not supported, yet")
+
+  if !type.isNominal {
+    // E.g. a non-copyable generic function parameter
+    return true
+  }
 
   let result: Bool
   if type.nominal.hasValueDeinit && !destroy.shouldDropDeinit {

SwiftCompilerSources/Sources/Optimizer/Utilities/OwnershipLiveness.swift

@@ -64,8 +64,11 @@ func computeLinearLiveness(for definingValue: Value, _ context: Context)
   var range = InstructionRange(for: definingValue, context)
 
   // Compute liveness.
-  definingValue.lookThroughBorrowedFromUser.uses.endingLifetime.forEach {
-    range.insert($0.instruction)
+ for use in definingValue.lookThroughBorrowedFromUser.uses {
+    let instruction = use.instruction
+    if use.endsLifetime || instruction is ExtendLifetimeInst {
+      range.insert(instruction)
+    }
   }
   return range
 }

SwiftCompilerSources/Sources/SIL/Argument.swift

@@ -60,10 +60,6 @@ final public class FunctionArgument : Argument {
     return index < parentFunction.numIndirectResultArguments
   }
 
-  public var hasResultDependsOn : Bool {
-    return bridged.hasResultDependsOn()
-  }
-
   /// If the function's result depends on this argument, return the
   /// kind of dependence.
   public var resultDependence: LifetimeDependenceConvention? {

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -147,7 +147,7 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
     case .IsNotSerialized: return .notSerialized
     case .IsSerialized: return .serialized
     case .IsSerializedForPackage: return .serializedForPackage
-    default: fatalError()
+    @unknown default: fatalError()
     }
   }
 
@@ -156,7 +156,6 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
     case .notSerialized: return .IsNotSerialized
     case .serialized: return .IsSerialized
     case .serializedForPackage: return .IsSerializedForPackage
-    default: fatalError()
     }
   }
 
@@ -290,10 +289,6 @@ extension Function {
   public var hasResultDependence: Bool {
     convention.resultDependencies != nil
   }
-
-  public var hasResultDependsOnSelf: Bool {
-    return bridged.hasResultDependsOnSelf()
-  }
 }
 
 public struct ArgumentTypeArray : RandomAccessCollection, FormattedLikeArray {

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -514,6 +514,8 @@ final public class DestroyAddrInst : Instruction, UnaryInstruction {
 
 final public class EndLifetimeInst : Instruction, UnaryInstruction {}
 
+final public class ExtendLifetimeInst : Instruction, UnaryInstruction {}
+
 final public class InjectEnumAddrInst : Instruction, UnaryInstruction, EnumInstruction {
   public var `enum`: Value { operand.value }
   public var caseIndex: Int { bridged.InjectEnumAddrInst_caseIndex() }

SwiftCompilerSources/Sources/SIL/Registration.swift

@@ -78,6 +78,7 @@ public func registerSILClasses() {
   register(DestroyValueInst.self)
   register(DestroyAddrInst.self)
   register(EndLifetimeInst.self)
+  register(ExtendLifetimeInst.self)
   register(StrongCopyUnownedValueInst.self)
   register(StrongCopyUnmanagedValueInst.self)
   register(StrongCopyWeakValueInst.self)

benchmark/CMakeLists.txt

@@ -209,10 +209,13 @@ set(SWIFT_BENCH_MODULES
     single-source/WordCount
     single-source/XorLoop
     cxx-source/CreateObjects
-    cxx-source/CxxSetToCollection
+    # Disabled for rdar://128520766
+    # cxx-source/CxxSetToCollection
     cxx-source/CxxStringConversion
-    cxx-source/CxxVectorSum
-    cxx-source/ReadAccessor
+    # Disabled for rdar://128520766
+    # cxx-source/CxxVectorSum
+    # TODO: rdar://92120528
+    # cxx-source/ReadAccessor
 )
 
 set(SWIFT_MULTISOURCE_SWIFT_BENCHES

benchmark/single-source/Breadcrumbs.swift

@@ -29,6 +29,12 @@ public let benchmarks: [BenchmarkInfo] = [
 
   CopyUTF16CodeUnits(workload: asciiWorkload, count: 500).info,
   CopyUTF16CodeUnits(workload: mixedWorkload, count: 500).info,
+  CopyUTF16CodeUnits(workload: longMixedWorkload, count: 50).info,
+  
+  CopyAllUTF16CodeUnits(workload: asciiWorkload, count: 1_000).info,
+  CopyAllUTF16CodeUnits(workload: mixedWorkload, count: 100).info,
+  CopyAllUTF16CodeUnits(workload: longASCIIWorkload, count: 7).info,
+  CopyAllUTF16CodeUnits(workload: longMixedWorkload, count: 1).info,
 
   MutatedUTF16ToIdx(workload: asciiWorkload, count: 50).info,
   MutatedUTF16ToIdx(workload: mixedWorkload, count: 50).info,
@@ -364,6 +370,11 @@ class CopyUTF16CodeUnits: BenchmarkBase {
     self.count = count
     super.init(name: "Breadcrumbs.CopyUTF16CodeUnits", workload: workload)
   }
+  
+  init(name: String, workload: Workload, count: Int) {
+    self.count = count
+    super.init(name: name, workload: workload)
+  }
 
   override func setUp() {
     super.setUp()
@@ -393,6 +404,21 @@ class CopyUTF16CodeUnits: BenchmarkBase {
   }
 }
 
+class CopyAllUTF16CodeUnits : CopyUTF16CodeUnits {
+  override init(workload: Workload, count: Int) {
+    super.init(
+      name: "Breadcrumbs.CopyAllUTF16CodeUnits",
+      workload: workload,
+      count: count
+    )
+  }
+  
+  override func setUp() {
+    super.setUp()
+    inputIndices = Array(repeating: 0 ..< inputString.utf16.count, count: count)
+  }
+}
+
 /// This is like `UTF16ToIdx` but appends to the string after every index
 /// conversion. In effect, this tests breadcrumb creation performance.
 class MutatedUTF16ToIdx: BenchmarkBase {

benchmark/single-source/CharacterRecognizer.swift

@@ -13,7 +13,7 @@
 import TestsUtils
 
 public var benchmarks: [BenchmarkInfo] {
-  guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
+  guard #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) else {
     return []
   }
   return [
@@ -82,7 +82,7 @@ let _asciiString = #"""
   """#
 let asciiString = String(repeating: _asciiString, count: 10)
 
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *)
 func run(string: String, n: Int) {
   var state = Unicode._CharacterRecognizer()
   var c = 0