Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

include/swift/Basic/Features.def

@@ -272,6 +272,7 @@ LANGUAGE_FEATURE(AddressOfProperty2, 0, "Builtin.unprotectedAddressOf properties
 LANGUAGE_FEATURE(NonescapableAccessorOnTrivial, 0, "Support UnsafeMutablePointer.mutableSpan")
 BASELINE_LANGUAGE_FEATURE(LayoutPrespecialization, 0, "Layout pre-specialization")
 BASELINE_LANGUAGE_FEATURE(IsolatedDeinit, 371, "isolated deinit")
+LANGUAGE_FEATURE(InlineArrayTypeSugar, 483, "Type sugar for InlineArray")
 
 // Swift 6
 UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
@@ -508,9 +509,6 @@ EXPERIMENTAL_FEATURE(CustomAvailability, true)
 /// Syntax sugar features for concurrency.
 EXPERIMENTAL_FEATURE(ConcurrencySyntaxSugar, true)
 
-/// Enable syntax sugar type '[3 of Int]' for Inline Array
-EXPERIMENTAL_FEATURE(InlineArrayTypeSugar, false)
-
 /// Allow declaration of compile-time values
 EXPERIMENTAL_FEATURE(CompileTimeValues, true)
 

lib/ASTGen/Sources/ASTGen/SourceFile.swift

@@ -77,7 +77,6 @@ extension Parser.ExperimentalFeatures {
     mapFeature(.CoroutineAccessors, to: .coroutineAccessors)
     mapFeature(.OldOwnershipOperatorSpellings, to: .oldOwnershipOperatorSpellings)
     mapFeature(.KeyPathWithMethodMembers, to: .keypathWithMethodMembers)
-    mapFeature(.InlineArrayTypeSugar, to: .inlineArrayTypeSugar)
     mapFeature(.DefaultIsolationPerFile, to: .defaultIsolationPerFile)
   }
 }

lib/Parse/ParseType.cpp

@@ -1318,8 +1318,6 @@ ParserResult<TypeRepr> Parser::parseTypeTupleBody() {
 }
 
 ParserResult<TypeRepr> Parser::parseTypeInlineArray(SourceLoc lSquare) {
-  ASSERT(Context.LangOpts.hasFeature(Feature::InlineArrayTypeSugar));
-
   ParserStatus status;
 
   // 'isStartOfInlineArrayTypeBody' means we should at least have a type and
@@ -1824,9 +1822,6 @@ bool Parser::canParseType() {
 }
 
 bool Parser::canParseStartOfInlineArrayType() {
-  if (!Context.LangOpts.hasFeature(Feature::InlineArrayTypeSugar))
-    return false;
-
   // We must have at least '[<type> of', which cannot be any other kind of
   // expression or type. We specifically look for any type, not just integers
   // for better recovery in e.g cases where the user writes '[Int of 2]'. We
@@ -1844,9 +1839,6 @@ bool Parser::canParseStartOfInlineArrayType() {
 }
 
 bool Parser::isStartOfInlineArrayTypeBody() {
-  if (!Context.LangOpts.hasFeature(Feature::InlineArrayTypeSugar))
-    return false;
-
   BacktrackingScope backtrack(*this);
   return canParseStartOfInlineArrayType();
 }
@@ -1856,7 +1848,7 @@ bool Parser::canParseCollectionType() {
     return false;
 
   // Check to see if we have an InlineArray sugar type.
-  if (Context.LangOpts.hasFeature(Feature::InlineArrayTypeSugar)) {
+  {
     CancellableBacktrackingScope backtrack(*this);
     if (canParseStartOfInlineArrayType()) {
       backtrack.cancelBacktrack();

lib/Sema/CSSimplify.cpp

@@ -10431,22 +10431,33 @@ performMemberLookup(ConstraintKind constraintKind, DeclNameRef memberName,
     }
 
     const auto isUnsupportedExistentialMemberAccess = [&] {
+      if (!instanceTy->isExistentialType())
+        return false;
+
+      // If the base type is composed with marker protocol(s) i.e.
+      // `<<Type>> & Sendable`, let's skip this check because such
+      // compositions are always opened and simplified down to a
+      // superclass bound post-Sema.
+      if (auto *existential = instanceTy->getAs<ExistentialType>()) {
+        auto *compositionTy =
+            existential->getConstraintType()->getAs<ProtocolCompositionType>();
+        if (compositionTy &&
+            !compositionTy->withoutMarkerProtocols()->isExistentialType())
+          return false;
+      }
+
       // We may not be able to derive a well defined type for an existential
       // member access if the member's signature references 'Self'.
-      if (instanceTy->isExistentialType()) {
-        switch (isMemberAvailableOnExistential(instanceTy, decl)) {
-        case ExistentialMemberAccessLimitation::Unsupported:
-        // TODO: Write-only accesses are not supported yet.
-        case ExistentialMemberAccessLimitation::WriteOnly:
-          return true;
+      switch (isMemberAvailableOnExistential(instanceTy, decl)) {
+      case ExistentialMemberAccessLimitation::Unsupported:
+      // TODO: Write-only accesses are not supported yet.
+      case ExistentialMemberAccessLimitation::WriteOnly:
+        return true;
 
-        case ExistentialMemberAccessLimitation::ReadOnly:
-        case ExistentialMemberAccessLimitation::None:
-          break;
-        }
+      case ExistentialMemberAccessLimitation::ReadOnly:
+      case ExistentialMemberAccessLimitation::None:
+        return false;
       }
-
-      return false;
     };
 
     // See if we have an instance method, instance member or static method,

test/ASTGen/types.swift

@@ -2,22 +2,18 @@
 
 // RUN: %target-swift-frontend-dump-parse -enable-experimental-feature ParserASTGen \
 // RUN:   -enable-experimental-feature NamedOpaqueTypes \
-// RUN:   -enable-experimental-feature InlineArrayTypeSugar \
 // RUN:   | %sanitize-address > %t/astgen.ast
 // RUN: %target-swift-frontend-dump-parse \
 // RUN:   -enable-experimental-feature NamedOpaqueTypes \
-// RUN:   -enable-experimental-feature InlineArrayTypeSugar \
 // RUN:   | %sanitize-address > %t/cpp-parser.ast
 
 // RUN: %diff -u %t/astgen.ast %t/cpp-parser.ast
 
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature ParserASTGen \
-// RUN:   -enable-experimental-feature NamedOpaqueTypes \
-// RUN:   -enable-experimental-feature InlineArrayTypeSugar
+// RUN:   -enable-experimental-feature NamedOpaqueTypes
 
 // REQUIRES: swift_feature_ParserASTGen
 // REQUIRES: swift_feature_NamedOpaqueTypes
-// REQUIRES: swift_feature_InlineArrayTypeSugar
 
 // rdar://116686158
 // UNSUPPORTED: asan

test/Availability/inline_array_availability.swift

@@ -1,6 +1,5 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature InlineArrayTypeSugar -target %target-cpu-apple-macosx15.0
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx15.0
 
-// REQUIRES: swift_feature_InlineArrayTypeSugar
 // REQUIRES: OS=macosx
 
 func foo(x: InlineArray<3, Int>) {}

test/DebugInfo/sugar_inline_array.swift

@@ -1,6 +1,4 @@
-// RUN: %target-swift-frontend %s -emit-ir -enable-experimental-feature InlineArrayTypeSugar -disable-availability-checking -g -o - | %FileCheck %s
-
-// REQUIRES: swift_feature_InlineArrayTypeSugar
+// RUN: %target-swift-frontend %s -emit-ir -disable-availability-checking -g -o - | %FileCheck %s
 
 let a: ([3 of Int], InlineArray<3, Int>) = ([1, 2, 3], [1, 2, 3])
 let b: ([3 of [1 of String]], InlineArray<3, InlineArray<1, String>>) = ([[""], [""], [""]], [[""], [""], [""]])

test/IDE/complete_inline_array.swift

@@ -1,6 +1,4 @@
-// RUN: %batch-code-completion -enable-experimental-feature InlineArrayTypeSugar
-
-// REQUIRES: swift_feature_InlineArrayTypeSugar
+// RUN: %batch-code-completion
 
 struct FooBar {}
 

test/Interpreter/protocol_composition_with_markers.swift

@@ -58,3 +58,27 @@ do {
   generic(Int.self)
   // CHECK: D<Int>
 }
+
+protocol Q {
+  func update(_: [Self])
+}
+
+extension Q {
+  func update(_ arr: [Self]) { print(Self.self) }
+}
+
+do {
+  class Parent : Q {}
+  class Subclass: Parent {}
+
+  func test(_ v: Parent & Sendable) {
+    v.update([])
+  }
+
+  test(Subclass())
+  // CHECK: Subclass
+
+  let sendableV: any Subclass & Sendable = Subclass()
+  test(sendableV)
+  // CHECK: Subclass
+}

test/Sema/inlinearray.swift

@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature InlineArrayTypeSugar
-
-// REQUIRES: swift_feature_InlineArrayTypeSugar
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 let a: InlineArray = [1, 2, 3] // Ok, InlineArray<3, Int>
 let b: InlineArray<_, Int> = [1, 2, 3] // Ok, InlineArray<3, Int>