Merge branch 'main' into nested-protocols

Author: hborla

.github/CODEOWNERS

@@ -62,7 +62,7 @@
 /include/swift/DependencyScan                      @artemcm
 /include/swift/Driver                              @artemcm
 # TODO: /include/swift/IRGen/
-/include/swift/IDE/                                @ahoppen @bnbarham @rintaro
+/include/swift/IDE/                                @ahoppen @bnbarham @rintaro @hamishknight
 /include/swift/Index/                              @bnbarham
 /include/swift/Refactoring                         @ahoppen @bnbarham
 /include/swift/Parse/                              @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
@@ -100,8 +100,8 @@
 /lib/DriverTool/swift_symbolgraph_extract_main.cpp  @QuietMisdreavus
 /lib/Frontend/*ModuleInterface*                     @artemcm @tshortli
 # TODO: /lib/IRGen/
-/lib/IDE/                                           @ahoppen @bnbarham @rintaro
-/lib/IDETool/                                       @ahoppen @bnbarham @rintaro
+/lib/IDE/                                           @ahoppen @bnbarham @rintaro @hamishknight
+/lib/IDETool/                                       @ahoppen @bnbarham @rintaro @hamishknight
 /lib/Index/                                         @bnbarham
 /lib/Refactoring/                                   @ahoppen @bnbarham
 /lib/IRGen/*Coverage*                               @hamishknight
@@ -139,24 +139,26 @@
 # stdlib
 # TODO: /stdlib/
 /stdlib/public/Backtracing/               @al45tair
+/stdlib/public/Concurrency/               @ktoso @kavon
 /stdlib/public/Cxx/                       @zoecarver @hyp @egorzhdan
 /stdlib/public/Distributed/               @ktoso
 /stdlib/public/Windows/                   @compnerd
 /stdlib/public/libexec/swift-backtrace/   @al45tair
 
 # test
 /test/ASTGen/                                       @zoecarver @CodaFi
+/test/Concurrency/                                  @ktoso @kavon
 /test/Constraints/                                  @hborla @xedin
 /test/DebugInfo/                                    @adrian-prantl
 /test/Distributed/                                  @ktoso
 /test/Driver/                                       @artemcm
 /test/Driver/static*                                @MaxDesiatov @etcwilde
 /test/Generics/                                     @hborla @slavapestov
 # TODO: /test/IRGen/
-/test/IDE/                                          @ahoppen @bnbarham @rintaro
+/test/IDE/                                          @ahoppen @bnbarham @rintaro @hamishknight
 /test/Index/                                        @bnbarham
 /test/refactoring/                                  @ahoppen @bnbarham
-/test/SourceKit/                                    @ahoppen @bnbarham @rintaro
+/test/SourceKit/                                    @ahoppen @bnbarham @rintaro @hamishknight
 /test/Interop/                                      @zoecarver @hyp @egorzhdan
 /test/Parse/                                        @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
 /test/Profiler                                      @hamishknight
@@ -177,9 +179,10 @@
 
 # tools
 # TODO: /tools
-/tools/SourceKit                                    @ahoppen @bnbarham @rintaro
+/tools/SourceKit                                    @ahoppen @bnbarham @rintaro @hamishknight
 /tools/lldb-moduleimport-test/                      @adrian-prantl
-/tools/swift-ide-test                               @ahoppen @bnbarham @rintaro
+/tools/swift-ide-test                               @ahoppen @bnbarham @rintaro @hamishknight
+/tools/swift-inspect                                @mikeash @al45tair @compnerd
 /tools/swift-refactor                               @ahoppen @bnbarham
 
 # unittests
@@ -188,7 +191,7 @@
 /unittests/Parse/                         @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
 # TODO: /unittests/SIL/
 /unittests/Sema/                          @hborla @xedin
-/unittests/SourceKit/                     @ahoppen @bnbarham @rintaro
+/unittests/SourceKit/                     @ahoppen @bnbarham @rintaro @hamishknight
 # TODO: /unittests/stdlib/
 
 # userdocs
@@ -209,7 +212,7 @@
 
 # validation-test
 # TODO: /validation-test/IRGen/
-/validation-test/IDE/                     @ahoppen @bnbarham @rintaro
+/validation-test/IDE/                     @ahoppen @bnbarham @rintaro @hamishknight
 /validation-test/Parse/                   @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
 # TODO: /validation-test/SIL/
 # TODO: /validation-test/SILGen/

CMakeLists.txt

@@ -646,6 +646,11 @@ option(SWIFT_THREADING_PACKAGE
    Valid package names are 'pthreads', 'darwin', 'linux', 'win32', 'c11', 'none'
    or the empty string for the SDK default.")
 
+option(SWIFT_THREADING_HAS_DLSYM
+  "Enable the use of the dlsym() function.  This gets used to provide TSan
+   support on some platforms."
+  TRUE)
+
 option(SWIFT_ENABLE_MACCATALYST
   "Build the Standard Library and overlays with MacCatalyst support"
   FALSE)
@@ -1043,6 +1048,14 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "ANDROID")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
 
+elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WASI")
+  set(SWIFT_HOST_VARIANT "wasi" CACHE STRING
+      "Deployment OS for Swift host tools (the compiler) [wasi]")
+
+  configure_sdk_unix("WASI" "wasm32")
+  set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
+
 elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
 
   set(SWIFT_HOST_VARIANT "macosx" CACHE STRING

SwiftCompilerSources/CMakeLists.txt

@@ -87,6 +87,10 @@ function(add_swift_compiler_modules_library name)
     list(APPEND swift_compile_options "-O" "-cross-module-optimization")
   endif()
 
+  if(NOT LLVM_ENABLE_ASSERTIONS)
+    list(APPEND swift_compile_options "-Xcc" "-DNDEBUG")
+  endif()
+
   if(NOT SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
     list(APPEND swift_compile_options "-Xfrontend" "-disable-legacy-type-info")
   endif()
@@ -227,7 +231,7 @@ else()
   add_subdirectory(Sources)
 
   # TODO: generate this dynamically through the modulemap; this cannot use `sed`
-  # as that is not available on all paltforms (e.g. Windows).
+  # as that is not available on all platforms (e.g. Windows).
   #
   # step 1: generate a dummy source file, which just includes all headers
   # defined in include/swift/module.modulemap

SwiftCompilerSources/Sources/Basic/SourceLoc.swift

@@ -27,7 +27,11 @@ public struct SourceLoc {
     guard bridged.isValid() else {
       return nil
     }
+#if $NewCxxMethodSafetyHeuristics
+    self.locationInFile = bridged.getOpaquePointerValue().assumingMemoryBound(to: UInt8.self)
+#else
     self.locationInFile = bridged.__getOpaquePointerValueUnsafe().assumingMemoryBound(to: UInt8.self)
+#endif
   }
 
   public var bridged: swift.SourceLoc {
@@ -57,9 +61,15 @@ public struct CharSourceRange {
   }
 
   public init?(bridged: swift.CharSourceRange) {
+#if $NewCxxMethodSafetyHeuristics
+    guard let start = SourceLoc(bridged: bridged.getStart()) else {
+      return nil
+    }
+#else
     guard let start = SourceLoc(bridged: bridged.__getStartUnsafe()) else {
       return nil
     }
+#endif
     self.init(start: start, byteLength: bridged.getByteLength())
   }
 

SwiftCompilerSources/Sources/Basic/Utils.swift

@@ -66,19 +66,34 @@ public struct StringRef : CustomStringConvertible, NoReflectionChildren {
   public var description: String { string }
 
   public var count: Int {
+#if $NewCxxMethodSafetyHeuristics
+    Int(_bridged.bytes_end() - _bridged.bytes_begin())
+#else
     Int(_bridged.__bytes_endUnsafe() - _bridged.__bytes_beginUnsafe())
+#endif
   }
 
   public subscript(index: Int) -> UInt8 {
+#if $NewCxxMethodSafetyHeuristics
+    let buffer = UnsafeBufferPointer<UInt8>(start: _bridged.bytes_begin(),
+                                            count: count)
+#else
     let buffer = UnsafeBufferPointer<UInt8>(start: _bridged.__bytes_beginUnsafe(),
                                             count: count)
+#endif
     return buffer[index]
   }
 
   public static func ==(lhs: StringRef, rhs: StaticString) -> Bool {
+#if $NewCxxMethodSafetyHeuristics
+    let lhsBuffer = UnsafeBufferPointer<UInt8>(
+      start: lhs._bridged.bytes_begin(),
+      count: lhs.count)
+#else
     let lhsBuffer = UnsafeBufferPointer<UInt8>(
       start: lhs._bridged.__bytes_beginUnsafe(),
       count: lhs.count)
+#endif
     return rhs.withUTF8Buffer { (rhsBuffer: UnsafeBufferPointer<UInt8>) in
       if lhsBuffer.count != rhsBuffer.count { return false }
       return lhsBuffer.elementsEqual(rhsBuffer, by: ==)

SwiftCompilerSources/Sources/Optimizer/Analysis/AliasAnalysis.swift

@@ -16,33 +16,6 @@ import SIL
 struct AliasAnalysis {
   let bridged: BridgedAliasAnalysis
 
-  func mayRead(_ inst: Instruction, fromAddress: Value) -> Bool {
-    switch bridged.getMemBehavior(inst.bridged, fromAddress.bridged) {
-      case .MayRead, .MayReadWrite, .MayHaveSideEffects:
-        return true
-      default:
-        return false
-    }
-  }
-
-  func mayWrite(_ inst: Instruction, toAddress: Value) -> Bool {
-    switch bridged.getMemBehavior(inst.bridged, toAddress.bridged) {
-      case .MayWrite, .MayReadWrite, .MayHaveSideEffects:
-        return true
-      default:
-        return false
-    }
-  }
-
-  func mayReadOrWrite(_ inst: Instruction, address: Value) -> Bool {
-    switch bridged.getMemBehavior(inst.bridged, address.bridged) {
-      case .MayRead, .MayWrite, .MayReadWrite, .MayHaveSideEffects:
-        return true
-      default:
-        return false
-    }
-  }
-
   /// Returns the correct path for address-alias functions.
   static func getPtrOrAddressPath(for value: Value) -> SmallProjectionPath {
     let ty = value.type
@@ -63,7 +36,7 @@ struct AliasAnalysis {
   static func register() {
     BridgedAliasAnalysis.registerAnalysis(
       // getMemEffectsFn
-      { (bridgedCtxt: BridgedPassContext, bridgedVal: BridgedValue, bridgedInst: BridgedInstruction) -> swift.MemoryBehavior in
+      { (bridgedCtxt: BridgedPassContext, bridgedVal: BridgedValue, bridgedInst: BridgedInstruction, complexityBudget: Int) -> swift.MemoryBehavior in
         let context = FunctionPassContext(_bridged: bridgedCtxt)
         let inst = bridgedInst.instruction
         let val = bridgedVal.value
@@ -74,7 +47,8 @@ struct AliasAnalysis {
         case let builtin as BuiltinInst:
           return getMemoryEffect(ofBuiltin: builtin, for: val, path: path, context).bridged
         default:
-          if val.at(path).isEscaping(using: EscapesToInstructionVisitor(target: inst, isAddress: true), context) {
+          if val.at(path).isEscaping(using: EscapesToInstructionVisitor(target: inst, isAddress: true),
+                                     complexityBudget: complexityBudget, context) {
             return .MayReadWrite
           }
           return .None
@@ -119,6 +93,35 @@ struct AliasAnalysis {
   }
 }
 
+extension Instruction {
+  func mayRead(fromAddress: Value, _ aliasAnalysis: AliasAnalysis) -> Bool {
+    switch aliasAnalysis.bridged.getMemBehavior(bridged, fromAddress.bridged) {
+      case .MayRead, .MayReadWrite, .MayHaveSideEffects:
+        return true
+      default:
+        return false
+    }
+  }
+
+  func mayWrite(toAddress: Value, _ aliasAnalysis: AliasAnalysis) -> Bool {
+    switch aliasAnalysis.bridged.getMemBehavior(bridged, toAddress.bridged) {
+      case .MayWrite, .MayReadWrite, .MayHaveSideEffects:
+        return true
+      default:
+        return false
+    }
+  }
+
+  func mayReadOrWrite(address: Value, _ aliasAnalysis: AliasAnalysis) -> Bool {
+    switch aliasAnalysis.bridged.getMemBehavior(bridged, address.bridged) {
+      case .MayRead, .MayWrite, .MayReadWrite, .MayHaveSideEffects:
+        return true
+      default:
+        return false
+    }
+  }
+}
+
 private func getMemoryEffect(ofApply apply: ApplySite, for address: Value, path: SmallProjectionPath, _ context: FunctionPassContext) -> SideEffects.Memory {
   let calleeAnalysis = context.calleeAnalysis
   let visitor = SideEffectsVisitor(apply: apply, calleeAnalysis: calleeAnalysis, isAddress: true)

SwiftCompilerSources/Sources/Optimizer/DataStructures/Stack.swift

@@ -47,17 +47,17 @@ struct Stack<Element> : CollectionLikeSequence {
 
     mutating func next() -> Element? {
       let end = (slab.data == lastSlab.data ? endIndex : slabCapacity)
-      if index < end {
-        let elem = Stack.bind(slab)[index]
-        index += 1
-
-        if index >= end && slab.data != lastSlab.data {
-          slab = slab.getNext()
-          index = 0
-        }
-        return elem
+      
+      guard index < end else { return nil }
+    
+      let elem = Stack.bind(slab)[index]
+      index += 1
+      
+      if index >= end && slab.data != lastSlab.data {
+        slab = slab.getNext()
+        index = 0
       }
-      return nil
+      return elem
     }
   }
 

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/CMakeLists.txt

@@ -11,12 +11,15 @@ swift_compiler_sources(Optimizer
   CleanupDebugSteps.swift
   ComputeEscapeEffects.swift
   ComputeSideEffects.swift
+  DeadStoreElimination.swift
   InitializeStaticGlobals.swift
   ObjectOutliner.swift
   ObjCBridgingOptimization.swift
   MergeCondFails.swift
   NamedReturnValueOptimization.swift
+  RedundantLoadElimination.swift
   ReleaseDevirtualizer.swift
   SimplificationPasses.swift
   StackPromotion.swift
+  StripObjectHeaders.swift
 )

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/ComputeSideEffects.swift

@@ -113,7 +113,7 @@ private struct CollectedEffects {
 
     case let store as StoreInst:
       addEffects(.write, to: store.destination)
-      if store.destinationOwnership == .assign {
+      if store.storeOwnership == .assign {
         addDestroyEffects(ofAddress: store.destination)
       }
 
@@ -454,7 +454,7 @@ private struct ArgumentEscapingWalker : ValueDefUseWalker, AddressDefUseWalker {
     case let load as LoadInst:
       if !address.value.hasTrivialType &&
           // In non-ossa SIL we don't know if a load is taking.
-          (!function.hasOwnership || load.ownership == .take) {
+          (!function.hasOwnership || load.loadOwnership == .take) {
         foundTakingLoad = true
       }
       return .continueWalk