Merge pull request swiftlang#73904 from tshortli/nonescapable-in-swiftinterface-6.0

[6.0] Sema: Relax feature check for non-escapable types in swiftinterfaces

Author: tshortli

include/swift/Sema/ConstraintSystem.h

@@ -4406,7 +4406,7 @@ class ConstraintSystem {
   /// \param UseDC The context of the access.  Some variables have different
   ///   types depending on where they are used.
   ///
-  /// \param memberLocator The locator anchored at this value reference, when
+  /// \param locator The locator anchored at this value reference, when
   /// it is a member reference.
   ///
   /// \param wantInterfaceType Whether we want the interface type, if available.
@@ -4424,7 +4424,7 @@ class ConstraintSystem {
   /// \param UseDC The context of the access.  Some variables have different
   ///   types depending on where they are used.
   ///
-  /// \param memberLocator The locator anchored at this value reference, when
+  /// \param locator The locator anchored at this value reference, when
   /// it is a member reference.
   ///
   /// \param wantInterfaceType Whether we want the interface type, if available.

lib/Sema/TypeCheckType.cpp

@@ -2071,6 +2071,11 @@ namespace {
       return (SF && SF->Kind == SourceFileKind::SIL);
     }
 
+    bool isInterfaceFile() const {
+      auto SF = getDeclContext()->getParentSourceFile();
+      return (SF && SF->Kind == SourceFileKind::Interface);
+    }
+
     /// Short-hand to query the current stage of type resolution.
     bool inStage(TypeResolutionStage stage) const {
       return resolution.getStage() == stage;
@@ -4782,6 +4787,7 @@ TypeResolver::resolveDeclRefTypeRepr(DeclRefTypeRepr *repr,
       if (auto known = proto->getKnownProtocol()) {
         if (*known == KnownProtocolKind::Escapable
             && !isSILSourceFile()
+            && !isInterfaceFile()
             && !ctx.LangOpts.hasFeature(Feature::NonescapableTypes)) {
           diagnoseInvalid(repr, repr->getLoc(),
                           diag::escapable_requires_feature_flag);

test/ModuleInterface/escapable.swiftinterface

@@ -0,0 +1,14 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Swift version 6.0
+// swift-module-flags: -swift-version 5 -enable-library-evolution -module-name Library
+
+// RUN: %target-swift-typecheck-module-from-interface(%s) -module-name Library
+
+import Swift
+import _Concurrency
+import _StringProcessing
+import _SwiftConcurrencyShims
+
+// Allow Escapable to appear without -enable-experimental-feature NonescapableTypes
+public struct S : Swift.Escapable {
+}

validation-test/ParseableInterface/rdar128577611.swift

@@ -0,0 +1,10 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library
+// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -module-name Library
+// RUN: %FileCheck %s < %t/Library.swiftinterface
+
+struct InternalStruct {}
+extension [Int: InternalStruct]: Sendable {}
+
+// CHECK: @available(*, unavailable)
+// CHECK: extension Swift.Dictionary : Swift.Copyable, Swift.Escapable, Swift.Sendable where Key : _ConstraintThatIsNotPartOfTheAPIOfThisLibrary {}