[6.0] Fix LifetimeDependenceDiagnostics to ignore closure captures

.github/CODEOWNERS

@@ -1,235 +1,2 @@
-# Lines starting with '#' are comments.
-# Each line is a case-sensitive file pattern followed by one or more owners.
-# Order is important. The last matching pattern has the most precedence.
-# More information: https://docs.github.com/en/articles/about-code-owners
-#
-# Please mirror the repository's file hierarchy in case-sensitive lexicographic
-# order.
-
-# TODO: /.clang-format
-
-/.clang-tidy   @egorzhdan
-
-# TODO: /.dir-locals.el
-# TODO: /.flake8
-# TODO: /.gitattributes
-
-# .github
-/.github/                                 @shahmishal
-/.github/CODEOWNERS                       @AnthonyLatsis @shahmishal
-/.github/ISSUE_TEMPLATE/                  @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
-/.github/PULL_REQUEST_TEMPLATE.md         @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
-
-# TODO: /.gitignore
-# TODO: /.mailmap
-# TODO: /Brewfile
-# TODO: /CHANGELOG.md
-# TODO: /CMakeLists.txt
-# TODO: /CODE_OF_CONDUCT.md
-# TODO: /CODE_OWNERS.TXT
-# TODO: /CONTRIBUTING.md
-# TODO: /LICENSE.txt
-# TODO: /README.md
-
-# SwiftCompilerSources
-/SwiftCompilerSources                     @eeckstein
-
-# apinotes
-# TODO: /apinotes
-
-# benchmark
-# TODO: /benchmark
-
-# bindings
-# TODO: /bindings
-
-# cmake
-/cmake/**/*Windows*                       @compnerd
-
-# docs
-/docs/Generics.rst                        @slavapestov
-/docs/Generics/                           @slavapestov
-/docs/HowToGuides/                        @AnthonyLatsis @LucianoPAlmeida @xedin
-
-# include
-/include/swift/AST/                                @hborla @slavapestov @xedin
-/include/swift/AST/*Availability*                  @tshortli
-/include/swift/AST/*Conformance*                   @slavapestov
-/include/swift/AST/*Distributed*                   @ktoso
-/include/swift/AST/*Generic*                       @hborla @slavapestov
-/include/swift/AST/*Protocol*                      @hborla @slavapestov
-/include/swift/AST/*Requirement*                   @hborla @slavapestov
-/include/swift/AST/*Substitution*                  @slavapestov
-/include/swift/AST/Evaluator*                      @CodaFi @slavapestov
-/include/swift/AST/DiagnosticsParse.def            @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/include/swift/ClangImporter                       @zoecarver @hyp @egorzhdan
-/include/swift/DependencyScan                      @artemcm
-/include/swift/Driver                              @artemcm
-# TODO: /include/swift/IRGen/
-/include/swift/IDE/                                @ahoppen @bnbarham @hamishknight @rintaro
-/include/swift/Index/                              @ahoppen @bnbarham @hamishknight @rintaro
-/include/swift/Option/*Options*                    @tshortli
-/include/swift/Parse/                              @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/include/swift/PrintAsClang                        @zoecarver @hyp @egorzhdan
-/include/swift/Refactoring                         @ahoppen @bnbarham @hamishknight @rintaro
-# TODO: /include/swift/SIL/
-# TODO: /include/swift/SILOptimizer/
-/include/swift/SIL/*Coverage*                      @ahoppen @bnbarham @hamishknight @rintaro
-/include/swift/SIL/SILProfiler.h                   @ahoppen @bnbarham @hamishknight @rintaro
-/include/swift/SIL/SILDebug*                       @adrian-prantl
-/include/swift/SILOptimizer/Utils/Distributed*     @ktoso
-/include/swift/Sema/                               @hborla @slavapestov @xedin
-/include/swift/Sema/CS*                            @hborla @xedin
-/include/swift/Sema/Constraint*                    @hborla @xedin
-/include/swift/SymbolGraphGen/                     @QuietMisdreavus
-/include/swift/Threading                           @al45tair
-
-# lib
-/lib/AST/                                           @hborla @slavapestov @xedin
-/lib/AST/*Availability*                             @tshortli
-/lib/AST/ASTPrinter.cpp                             @hborla @slavapestov @xedin @tshortli
-/lib/AST/*Conformance*                              @slavapestov
-/lib/AST/*Generic*                                  @hborla @slavapestov
-/lib/AST/*Requirement*                              @hborla @slavapestov
-/lib/AST/*Substitution                              @slavapestov
-/lib/AST/Evaluator*                                 @CodaFi @slavapestov
-/lib/AST/ModuleLoader.cpp                           @artemcm
-/lib/AST/RequirementMachine/                        @slavapestov
-/lib/ASTGen/                                        @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
-/lib/Basic/Windows                                  @compnerd
-/lib/ClangImporter                                  @zoecarver @hyp @egorzhdan
-/lib/ClangImporter/DWARFImporter*                   @adrian-prantl
-/lib/DependencyScan                                 @artemcm
-/lib/Driver                                         @artemcm
-/lib/DriverTool/autolink_extract_main.cpp           @MaxDesiatov @etcwilde
-/lib/DriverTool/swift_symbolgraph_extract_main.cpp  @QuietMisdreavus
-/lib/Frontend/*ModuleInterface*                     @artemcm @tshortli
-# TODO: /lib/IRGen/
-/lib/IDE/                                           @ahoppen @bnbarham @hamishknight @rintaro
-/lib/IDETool/                                       @ahoppen @bnbarham @hamishknight @rintaro
-/lib/IRGen/*Coverage*                               @ahoppen @bnbarham @hamishknight @rintaro
-/lib/IRGen/*Debug*                                  @adrian-prantl
-/lib/IRGen/*Distributed*                            @ktoso
-/lib/Index/                                         @ahoppen @bnbarham @hamishknight @rintaro
-/lib/Parse/                                         @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/lib/PrintAsClang                                   @zoecarver @hyp @egorzhdan
-/lib/Refactoring/                                   @ahoppen @bnbarham @hamishknight @rintaro
-# TODO: /lib/SIL/
-/lib/SIL/IR/*Coverage*                              @ahoppen @bnbarham @hamishknight @rintaro
-/lib/SIL/IR/SILProfiler.cpp                         @ahoppen @bnbarham @hamishknight @rintaro
-/lib/SIL/IR/SILDebug*                               @adrian-prantl
-/lib/SIL/IR/SILLocation*                            @adrian-prantl
-# TODO: /lib/SILGen/
-/lib/SILGen/*Distributed*                           @ktoso
-# TODO: /lib/SILOptimizer/
-/lib/SILOptimizer/Mandatory/FlowIsolation.cpp       @kavon
-/lib/SILOptimizer/Mandatory/ConsumeOperator*        @kavon
-/lib/SILOptimizer/Mandatory/MoveOnly*               @kavon
-/lib/SILOptimizer/Utils/Distributed*                @ktoso
-/lib/Sema/                                          @hborla @slavapestov @xedin
-/lib/Sema/*Availability*                            @tshortli
-/lib/Sema/CS*                                       @hborla @xedin
-/lib/Sema/CodeSynthesisDistributed*                 @hborla @ktoso
-/lib/Sema/Constraint*                               @hborla @xedin
-/lib/Sema/DerivedConformance*                       @slavapestov
-/lib/Sema/DerivedConformanceDistributed*            @ktoso @slavapestov
-/lib/Sema/TypeCheckDistributed*                     @hborla @ktoso @xedin
-/lib/Sema/TypeCheckProtocol*                        @AnthonyLatsis @hborla @slavapestov
-/lib/Sema/TypeCheckType*                            @AnthonyLatsis @hborla @slavapestov @xedin
-/lib/Serialization/SerializedModuleLoader.cpp       @artemcm
-/lib/SymbolGraphGen                                 @QuietMisdreavus
-/lib/Threading                                      @al45tair
-
-# localization
-# TODO: /localization
-
-# stdlib
-/stdlib/                                  @apple/standard-librarians
-/stdlib/public/Backtracing/               @al45tair
-/stdlib/public/Concurrency/               @ktoso
-/stdlib/public/Cxx/                       @zoecarver @hyp @egorzhdan
-/stdlib/public/Distributed/               @ktoso
-/stdlib/public/Observation/               @phausler
-/stdlib/public/Threading/                 @al45tair
-/stdlib/public/Windows/                   @compnerd
-/stdlib/public/libexec/swift-backtrace/   @al45tair
-/stdlib/public/runtime/                   @mikeash @al45tair
-
-# test
-/test/ASTGen/                                       @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
-/test/Concurrency/                                  @ktoso
-/test/Constraints/                                  @hborla @xedin
-/test/DebugInfo/                                    @adrian-prantl
-/test/Distributed/                                  @ktoso
-/test/Driver/                                       @artemcm
-/test/Driver/static*                                @MaxDesiatov @etcwilde
-/test/Generics/                                     @hborla @slavapestov
-/test/Generics/inverse*                             @kavon
-# TODO: /test/IRGen/
-/test/IDE/                                          @ahoppen @bnbarham @hamishknight @rintaro
-/test/Index/                                        @ahoppen @bnbarham @hamishknight @rintaro
-/test/Interop/                                      @zoecarver @hyp @egorzhdan
-/test/Parse/                                        @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/test/Profiler                                      @ahoppen @bnbarham @hamishknight @rintaro
-# TODO: /test/SIL/
-# TODO: /test/SILGen/
-# TODO: /test/SILOptimizer/
-/test/SILOptimizer/moveonly*                        @kavon
-/test/SILOptimizer/noimplicitcopy*                  @kavon
-/test/ScanDependencies/                             @artemcm
-/test/Sema/                                         @hborla @slavapestov @xedin
-/test/Sema/moveonly*                                @kavon
-/test/SourceKit/                                    @ahoppen @bnbarham @hamishknight @rintaro
-/test/SymbolGraph/                                  @QuietMisdreavus
-/test/abi/                                          @apple/standard-librarians
-/test/decl/                                         @hborla @slavapestov
-/test/decl/protocol/                                @AnthonyLatsis @hborla @slavapestov
-# FIXME: This file could have a dedicated directory.
-/test/decl/protocol/special/DistributedActor.swift  @ktoso
-/test/expr/                                         @hborla @slavapestov @xedin
-/test/refactoring/                                  @ahoppen @bnbarham @hamishknight @rintaro
-/test/stdlib/                                       @apple/standard-librarians
-/test/stmt/                                         @hborla @xedin
-/test/type/                                         @hborla @slavapestov @xedin
-
-# tools
-# TODO: /tools
-/tools/SourceKit                                    @ahoppen @bnbarham @hamishknight @rintaro
-/tools/lldb-moduleimport-test/                      @adrian-prantl
-/tools/swift-ide-test                               @ahoppen @bnbarham @hamishknight @rintaro
-/tools/swift-inspect                                @mikeash @al45tair @compnerd
-/tools/swift-refactor                               @ahoppen @bnbarham @hamishknight @rintaro
-
-# unittests
-/unittests/AST/                           @hborla @slavapestov @xedin
-/unittests/AST/*Evaluator*                @CodaFi @slavapestov
-/unittests/Parse/                         @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-# TODO: /unittests/SIL/
-/unittests/Sema/                          @hborla @xedin
-/unittests/SourceKit/                     @ahoppen @bnbarham @rintaro @hamishknight
-
-# userdocs
-# TODO: /userdocs
-
-# utils
-/utils/*windows*                                              @compnerd
-/utils/gyb_sourcekit_support/                                 @ahoppen @bnbarham @hamishknight @rintaro
-/utils/sourcekit_fuzzer/                                      @ahoppen @bnbarham @hamishknight @rintaro
-/utils/swift_build_support/products/earlyswiftsyntax.py       @ahoppen @bnbarham @hamishknight @rintaro
-/utils/swift_build_support/products/skstresstester.py         @ahoppen @bnbarham @hamishknight @rintaro
-/utils/swift_build_support/products/sourcekitlsp.py           @ahoppen @bnbarham @hamishknight @rintaro
-/utils/swift_build_support/products/swiftformat.py            @ahoppen @allevato @bnbarham @hamishknight @rintaro
-/utils/swift_build_support/products/swiftsyntax.py            @ahoppen @bnbarham @hamishknight @rintaro
-/utils/update-checkout*                                       @shahmishal
-/utils/update_checkout/                                       @shahmishal
-/utils/vim/                                                   @compnerd
-
-# validation-test
-# TODO: /validation-test/IRGen/
-/validation-test/IDE/                     @ahoppen @bnbarham @rintaro @hamishknight
-/validation-test/Parse/                   @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-# TODO: /validation-test/SIL/
-# TODO: /validation-test/SILGen/
-# TODO: /validation-test/SILOptimizer/
-/validation-test/Sema/                    @hborla @slavapestov @xedin
-/validation-test/stdlib/                  @apple/standard-librarians
+# For the release branch @apple/swift5-branch-managers needs to approve the changes
+* @apple/swift5-branch-managers

CHANGELOG.md

@@ -4,6 +4,38 @@
 > This is in reverse chronological order, so newer entries are added to the top.
 
 ## Swift 6.0
+
+* Swift 5.10 missed a semantic check from [SE-0309][]. In type context, a reference to a
+  protocol `P` that has associated types or `Self` requirements should use
+  the `any` keyword, but this was not enforced in nested generic argument positions.
+  This is now an error as required by the proposal:
+
+  ```swift
+  protocol P { associatedtype A }
+  struct Outer<T> { struct Inner<U> { } }
+  let x = Outer<P>.Inner<P>()  // error
+  ```
+  To correct the error, add `any` where appropriate, for example
+  `Outer<any P>.Inner<any P>`.
+
+* Swift 5.10 accepted certain invalid opaque return types from [SE-0346][].
+  If a generic argument of a constrained opaque return type did not
+  satisfy the requirements on the primary associated type, the generic
+  argument was silently ignored and type checking would proceed as if it
+  weren't stated. This now results in a diagnostic:
+
+  ```swift
+  protocol P<A> { associatedtype A: Sequence }
+  struct G<A: Sequence>: P {}
+
+  func f() -> some P<Int> { return G<Array<Int>>() }  // error
+  ```
+
+  The return type above should be written as `some P<Array<Int>>` to match
+  the return statement. The old broken behavior in this situation can also
+  be restored, by removing the erroneous constraint and using the more general
+  upper bound `some P`.
+
 * [SE-0408][]:
   A `for`-`in` loop statement can now accept a pack expansion expression,
   enabling iteration over the elements of its respective value pack. This form

CMakeLists.txt

@@ -663,10 +663,6 @@ option(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED
   "Enable experimental distributed actors and functions"
   FALSE)
 
-option(SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS
-  "Enable experimental NoncopyableGenerics"
-  FALSE)
-
 option(SWIFT_ENABLE_EXPERIMENTAL_NONESCAPABLE_TYPES
   "Enable experimental NonescapableTypes"
   FALSE)
@@ -1278,7 +1274,6 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Differentiable Programming Support: ${SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING}")
   message(STATUS "Concurrency Support:                ${SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY}")
   message(STATUS "Distributed Support:                ${SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED}")
-  message(STATUS "NoncopyableGenerics Support:        ${SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS}")
   message(STATUS "NonEscapableTypes Support:          ${SWIFT_ENABLE_EXPERIMENTAL_NONESCAPABLE_TYPES}")
   message(STATUS "String Processing Support:          ${SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING}")
   message(STATUS "Backtracing Support:                ${SWIFT_ENABLE_BACKTRACING}")

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceDiagnostics.swift

@@ -14,9 +14,9 @@ import SIL
 
 private let verbose = false
 
-private func log(_ message: @autoclosure () -> String) {
+private func log(prefix: Bool = true, _ message: @autoclosure () -> String) {
   if verbose {
-    print("### \(message())")
+    print((prefix ? "### " : "") + message())
   }
 }
 
@@ -29,10 +29,7 @@ private func log(_ message: @autoclosure () -> String) {
 let lifetimeDependenceDiagnosticsPass = FunctionPass(
   name: "lifetime-dependence-diagnostics")
 { (function: Function, context: FunctionPassContext) in
-  if !context.options.hasFeature(.NonescapableTypes) {
-    return
-  }
-  log(" --- Diagnosing lifetime dependence in \(function.name)")
+  log(prefix: false, "\n--- Diagnosing lifetime dependence in \(function.name)")
   log("\(function)")
 
   for argument in function.arguments
@@ -45,7 +42,7 @@ let lifetimeDependenceDiagnosticsPass = FunctionPass(
     }
   }
   for instruction in function.instructions {
-    if let markDep = instruction as? MarkDependenceInst {
+    if let markDep = instruction as? MarkDependenceInst, markDep.isUnresolved {
       if let lifetimeDep = LifetimeDependence(markDep, context) {
         analyze(dependence: lifetimeDep, context)
       }
@@ -297,6 +294,8 @@ private struct LifetimeVariable {
       // TODO: bridge VarDecl for FunctionConvention.Yields
       self.varDecl = nil
       self.sourceLoc = result.parentInstruction.location.sourceLoc
+    case .storeBorrow(let sb):
+      self = .init(dependent: sb.source, context)
     case .pointer(let ptrToAddr):
       self.varDecl = nil
       self.sourceLoc = ptrToAddr.location.sourceLoc

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceInsertion.swift

@@ -22,19 +22,16 @@ import SIL
 
 private let verbose = false
 
-private func log(_ message: @autoclosure () -> String) {
+private func log(prefix: Bool = true, _ message: @autoclosure () -> String) {
   if verbose {
-    print("### \(message())")
+    print((prefix ? "### " : "") + message())
   }
 }
 
 let lifetimeDependenceInsertionPass = FunctionPass(
   name: "lifetime-dependence-insertion")
 { (function: Function, context: FunctionPassContext) in
-  if !context.options.hasFeature(.NonescapableTypes) {
-    return
-  }
-  log(" --- Inserting lifetime dependence markers in \(function.name)")
+  log(prefix: false, "\n--- Inserting lifetime dependence markers in \(function.name)")
 
   for instruction in function.instructions {
     if let dependentApply = LifetimeDependentApply(instruction) {