Merge pull request #69103 from karwa/nested-protocol-5-10

slavapestov · web-flow · commit e4400bc57a1c · 2023-10-11T09:36:50.000-04:00
[5.10][SE-0404] Allow protocols to be nested in non-generic contexts
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -2187,9 +2187,12 @@ ERROR(unsupported_type_nested_in_protocol,none,
 ERROR(unsupported_type_nested_in_protocol_extension,none,
       "type %0 cannot be nested in protocol extension of %1",
       (const NominalTypeDecl *, const ProtocolDecl *))
-ERROR(unsupported_nested_protocol,none,
-      "protocol %0 cannot be nested inside another declaration",
+ERROR(unsupported_nested_protocol_in_generic,none,
+      "protocol %0 cannot be nested in a generic context",
       (const NominalTypeDecl *))
+ERROR(unsupported_nested_protocol_in_protocol,none,
+      "protocol %0 cannot be nested in protocol %1",
+      (const NominalTypeDecl *, const NominalTypeDecl *))
 ERROR(where_nongeneric_ctx,none,
       "'where' clause on non-generic member declaration requires a "
       "generic context", ())
diff --git a/include/swift/AST/TypeMemberVisitor.h b/include/swift/AST/TypeMemberVisitor.h
@@ -37,7 +37,6 @@ class TypeMemberVisitor : public DeclVisitor<ImplClass, RetTy> {
   }
   BAD_MEMBER(Extension)
   BAD_MEMBER(Import)
-  BAD_MEMBER(Protocol)
   BAD_MEMBER(TopLevelCode)
   BAD_MEMBER(Operator)
   BAD_MEMBER(PrecedenceGroup)
diff --git a/lib/AST/ASTScopeLookup.cpp b/lib/AST/ASTScopeLookup.cpp
@@ -193,8 +193,7 @@ void ASTScopeImpl::lookup(const NullablePtr<const ASTScopeImpl> limit,
   consumer.startingNextLookupStep();
 #endif
 
-  // Certain illegal nestings, e.g. protocol nestled inside a struct,
-  // require that lookup stop at the outer scope.
+  // Certain illegal nestings require that lookup stop at the outer scope.
   if (this == limit.getPtrOrNull()) {
 #ifndef NDEBUG
     consumer.finishingLookup("limit return");
@@ -558,13 +557,13 @@ GenericTypeOrExtensionScope::getLookupLimitForDecl() const {
 
 NullablePtr<const ASTScopeImpl>
 NominalTypeScope::getLookupLimitForDecl() const {
-  if (isa<ProtocolDecl>(decl)) {
-    // ProtocolDecl can only be legally nested in a SourceFile,
-    // so any other kind of Decl is illegal
-    return parentIfNotChildOfTopScope();
-  }
-  // AFAICT, a struct, decl, or enum can be nested inside anything
-  // but a ProtocolDecl.
+  // If a protocol is (invalidly) nested in a generic context,
+  // do not look in to those outer generic contexts,
+  // as types found there may contain implicitly inferred generic parameters.
+  if (isa<ProtocolDecl>(decl) && decl->getDeclContext()->isGenericContext())
+    return getLookupParent();
+
+  // Otherwise, nominals can be nested inside anything but a ProtocolDecl.
   return ancestorWithDeclSatisfying(
       [&](const Decl *const d) { return isa<ProtocolDecl>(d); });
 }
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -4868,11 +4868,10 @@ static Type computeNominalType(NominalTypeDecl *decl, DeclTypeKind kind) {
   // If `decl` is a nested type, find the parent type.
   Type ParentTy;
   DeclContext *dc = decl->getDeclContext();
-  bool isObjCProtocol = isa<ProtocolDecl>(decl) && decl->hasClangNode();
+  bool isUnsupportedNestedProtocol =
+    isa<ProtocolDecl>(decl) && decl->getParent()->isGenericContext();
 
-  // Objective-C protocols, unlike Swift protocols, could be nested
-  // in other types.
-  if ((isObjCProtocol || !isa<ProtocolDecl>(decl)) && dc->isTypeContext()) {
+  if (!isUnsupportedNestedProtocol && dc->isTypeContext()) {
     switch (kind) {
     case DeclTypeKind::DeclaredType: {
       if (auto *nominal = dc->getSelfNominalTypeDecl())
@@ -4909,9 +4908,9 @@ static Type computeNominalType(NominalTypeDecl *decl, DeclTypeKind kind) {
     }
 
     llvm_unreachable("Unhandled DeclTypeKind in switch.");
-  } else {
-    return NominalType::get(decl, ParentTy, ctx);
   }
+
+  return NominalType::get(decl, ParentTy, ctx);
 }
 
 Type NominalTypeDecl::getDeclaredType() const {
diff --git a/lib/AST/DeclContext.cpp b/lib/AST/DeclContext.cpp
@@ -132,6 +132,10 @@ void DeclContext::forEachGenericContext(
       if (auto genericCtx = decl->getAsGenericContext())
         if (auto *gpList = genericCtx->getGenericParams())
           fn(gpList);
+
+      // Protocols do not capture outer generic parameters.
+      if (isa<ProtocolDecl>(decl))
+        return;
     }
   } while ((dc = dc->getParentForLookup()));
 }
@@ -259,12 +263,18 @@ DeclContext *DeclContext::getInnermostSkippedFunctionContext() {
 }
 
 DeclContext *DeclContext::getParentForLookup() const {
-  if (isa<ProtocolDecl>(this) || isa<ExtensionDecl>(this)) {
-    // If we are inside a protocol or an extension, skip directly
+  if (isa<ExtensionDecl>(this)) {
+    // If we are inside an extension, skip directly
     // to the module scope context, without looking at any (invalid)
     // outer types.
     return getModuleScopeContext();
   }
+  if (isa<ProtocolDecl>(this) && getParent()->isGenericContext()) {
+    // Protocols in generic contexts must not look in to their parents,
+    // as the parents may contain types with inferred implicit
+    // generic parameters not present in the protocol's generic signature.
+    return getModuleScopeContext();
+  }
   if (isa<NominalTypeDecl>(this)) {
     // If we are inside a nominal type that is inside a protocol,
     // skip the protocol.
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -5530,7 +5530,6 @@ void IRGenModule::emitNestedTypeDecls(DeclRange members) {
     switch (member->getKind()) {
     case DeclKind::Import:
     case DeclKind::TopLevelCode:
-    case DeclKind::Protocol:
     case DeclKind::Extension:
     case DeclKind::InfixOperator:
     case DeclKind::PrefixOperator:
@@ -5586,6 +5585,9 @@ void IRGenModule::emitNestedTypeDecls(DeclRange members) {
     case DeclKind::Class:
       emitClassDecl(cast<ClassDecl>(member));
       continue;
+    case DeclKind::Protocol:
+      emitProtocolDecl(cast<ProtocolDecl>(member));
+      continue;
     case DeclKind::MacroExpansion:
       // Expansion already visited as auxiliary decls.
       continue;
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -9241,7 +9241,7 @@ parseDeclProtocol(ParseDeclOptions Flags, DeclAttributes &Attributes) {
       ProtocolDecl(CurDeclContext, ProtocolLoc, NameLoc, ProtocolName,
                    Context.AllocateCopy(PrimaryAssociatedTypeNames),
                    Context.AllocateCopy(InheritedProtocols), TrailingWhere);
-  // No need to setLocalDiscriminator: protocols can't appear in local contexts.
+  recordLocalType(Proto);
 
   Proto->getAttrs() = Attributes;
   if (whereClauseHadCodeCompletion && CodeCompletionCallbacks)
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -2675,10 +2675,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         return;
       }
 
-      // We don't support protocols outside the top level of a file.
-      if (isa<ProtocolDecl>(NTD) &&
-          !DC->isModuleScopeContext()) {
-        NTD->diagnose(diag::unsupported_nested_protocol, NTD);
+      // We don't support protocols nested in generic contexts.
+      // This includes protocols nested in other protocols.
+      if (isa<ProtocolDecl>(NTD) && DC->isGenericContext()) {
+        if (auto *OuterPD = DC->getSelfProtocolDecl())
+          NTD->diagnose(diag::unsupported_nested_protocol_in_protocol, NTD,
+                        OuterPD);
+        else
+          NTD->diagnose(diag::unsupported_nested_protocol_in_generic, NTD);
+
         NTD->setInvalid();
         return;
       }
@@ -2691,6 +2696,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         } else {
           NTD->diagnose(diag::unsupported_type_nested_in_protocol, NTD, proto);
         }
+        NTD->setInvalid();
       }
     }
 
@@ -2704,6 +2710,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         } else {
           NTD->diagnose(diag::unsupported_type_nested_in_generic_closure, NTD);
         }
+        NTD->setInvalid();
       }
     }
   }
diff --git a/test/IRGen/protocol_metadata.swift b/test/IRGen/protocol_metadata.swift
@@ -118,3 +118,60 @@ protocol Comprehensive {
 // CHECK-SAME:   %swift.protocol_requirement { i32 4, i32 0 },
 // CHECK-SAME:   %swift.protocol_requirement { i32 6, i32 0 }
 
+  struct ParentType {
+
+    // NESTED: [[NESTED_NAME:@.*]] = private constant [7 x i8] c"Nested\00"
+    // NESTED: [[NESTED_RETURNVALUE_NAME:@.*]] = private constant [12 x i8] c"ReturnValue\00"
+
+    // NESTED: @"$s17protocol_metadata10ParentTypeV6NestedMp" = hidden constant
+    // NESTED-SAME: i32 65603,
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeVMn"
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeV6NestedMp", i32 0, i32 1)
+    // NESTED-SAME: [7 x i8]* [[NESTED_NAME]]
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeV6NestedMp", i32 0, i32 2)
+    // NESTED-SAME: i32 0,
+    // NESTED-SAME: i32 2,
+    // NESTED-SAME: [12 x i8]* [[NESTED_RETURNVALUE_NAME]]
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeV6NestedMp", i32 0, i32 5)
+    // NESTED-SAME: %swift.protocol_requirement { i32 7, i32 0 },
+    // NESTED-SAME: %swift.protocol_requirement { i32 17, i32 0 }
+    protocol Nested {
+      associatedtype ReturnValue
+      func doSomething() -> ReturnValue
+    }
+  }
+
+  extension ParentType {
+
+    // NESTED: [[NESTEDVIAEXT_NAME:@.*]] = private constant [19 x i8] c"NestedViaExtension\00"
+
+    // NESTED: @"$s17protocol_metadata10ParentTypeV18NestedViaExtensionMp" = hidden constant
+    // NESTED-SAME: i32 65603,
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeVMn"
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeV18NestedViaExtensionMp", i32 0, i32 1)
+    // NESTED-SAME: [19 x i8]* [[NESTEDVIAEXT_NAME]]
+    // NESTED-SAME: @"$s17protocol_metadata10ParentTypeV18NestedViaExtensionMp", i32 0, i32 2)
+    // NESTED-SAME: i32 0,
+    // NESTED-SAME: i32 1,
+    // NESTED-SAME: i32 0,
+    // NESTED-SAME: %swift.protocol_requirement { i32 17, i32 0 }
+    protocol NestedViaExtension {
+      func foo()
+    }
+  }
+
+  func parentFunc() {
+    // NESTED: @"$s17protocol_metadata10parentFuncyyF6NestedL_Mp" = internal constant
+    // NESTED-SAME: i32 65603,
+    // NESTED-SAME: @"$s17protocol_metadata10parentFuncyyF6NestedL_PMXX"
+    // NESTED-SAME: @"$s17protocol_metadata10parentFuncyyF6NestedL_Mp", i32 0, i32 1)
+    // NESTED-SAME: [7 x i8]* [[NESTED_NAME]]
+    // NESTED-SAME: @"$s17protocol_metadata10parentFuncyyF6NestedL_Mp", i32 0, i32 2)
+    // NESTED-SAME: i32 0,
+    // NESTED-SAME: i32 1,
+    // NESTED-SAME: i32 0,
+    // NESTED-SAME: %swift.protocol_requirement { i32 17, i32 0 }
+    protocol Nested {
+      func foo()
+    }
+  }
diff --git a/test/PrintAsObjC/classes.swift b/test/PrintAsObjC/classes.swift
@@ -409,6 +409,12 @@ class MyObject : NSObject {}
     @objc @objcMembers class DeeperIn {}
   }
 
+  // CHECK-LABEL: SWIFT_CLASS_NAMED("CustomNameInner")
+  // CHECK-NEXT: @interface MyInnerClass
+  // CHECK-NEXT: init
+  // CHECK-NEXT: @end
+  @objc(MyInnerClass) @objcMembers class CustomNameInner {}
+
   // CHECK-LABEL: @interface AnotherInner : A1
   // CHECK-NEXT: init
   // CHECK-NEXT: @end
diff --git a/test/PrintAsObjC/protocols.swift b/test/PrintAsObjC/protocols.swift
@@ -137,6 +137,26 @@ extension NSString : A, ZZZ {}
   @objc optional func f()
 }
 
+// NESTED-LABEL: @interface ParentClass
+// NESTED-NEXT: @end
+@objc class ParentClass {
+
+  // NESTED-LABEL: @protocol Nested
+  // NESTED-NEXT: @end
+  @objc protocol Nested {}
+
+  // NESTED-LABEL: SWIFT_PROTOCOL_NAMED("Nested2")
+  // NESTED-NEXT: @protocol NestedInParent
+  // NESTED-NEXT: @end
+  @objc(NestedInParent) protocol Nested2 {}
+}
+
+extension ParentClass {
+  // NESTED-LABEL: @protocol NestedInExtensionOfParent
+  // NESTED-NEXT: @end
+  @objc protocol NestedInExtensionOfParent {}
+}
+
 // NEGATIVE-NOT: @protocol PrivateProto
 @objc private protocol PrivateProto {}
 
diff --git a/test/Runtime/nested-protocols.swift b/test/Runtime/nested-protocols.swift
@@ -0,0 +1,64 @@
+// RUN: %target-run-simple-swift
+
+// REQUIRES: executable_test
+
+enum E {
+  protocol P {}
+}
+
+struct Conforms {}
+extension Conforms: E.P {}
+
+struct DoesNotConform {}
+
+struct S<T> {}
+extension S: E.P where T: E.P {}
+
+@inline(never)
+func castToNested(_ value: Any) -> (any E.P)? {
+    value as? any E.P
+}
+
+// Regular conformance.
+
+precondition(castToNested(Conforms()) != nil)
+precondition(castToNested(DoesNotConform()) == nil)
+
+// Conditional conformance.
+
+precondition(castToNested(S<Conforms>()) != nil)
+precondition(castToNested(S<DoesNotConform>()) == nil)
+
+// Verify that 'E.P' and a non-nested 'P' are different.
+
+protocol P {}
+
+@inline(never)
+func castToNonNested(_ value: Any) -> (any P)? {
+    value as? any P
+}
+
+precondition(castToNonNested(Conforms()) == nil)
+precondition(castToNonNested(S<Conforms>()) == nil)
+precondition(castToNonNested(DoesNotConform()) == nil)
+precondition(castToNonNested(S<DoesNotConform>()) == nil)
+
+// Local protocols.
+
+@inline(never)
+func f0(_ input: Any) -> (Any, inputConforms: Bool) {
+
+  protocol LocalProto { }
+  struct ConformsToLocal: LocalProto {}
+
+  if let input = input as? any LocalProto {
+    return (input, true)
+  } else {
+    return (ConformsToLocal(), false)
+  }
+}
+
+var result = f0(DoesNotConform())
+precondition(result.inputConforms == false)
+result = f0(result.0)
+precondition(result.inputConforms == true)
diff --git a/test/Serialization/Inputs/nested-protocols.swift b/test/Serialization/Inputs/nested-protocols.swift
@@ -0,0 +1,11 @@
+public struct Outer {
+  public protocol Inner {
+    func foo()
+  }
+}
+
+extension Outer {
+  public protocol InnerInExtension {
+    func bar()
+  }
+}
diff --git a/test/Serialization/nested-protocols.swift b/test/Serialization/nested-protocols.swift
@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -module-name nestedprotocolsource -emit-module-path %t/nestedprotocolsource.swiftmodule -primary-file %S/Inputs/nested-protocols.swift
+// RUN: %target-swift-frontend -emit-sil %s -I %t | %FileCheck %s
+import nestedprotocolsource
+
+// CHECK: usesNested<A>(_:)
+// CHECK-NEXT: sil @$s4main10usesNestedyyx20nestedprotocolsource5OuterV5InnerRzlF :
+public func usesNested(_ x: some Outer.Inner) {}
+
+// CHECK: usesNestedInExtension<A>(_:)
+// CHECK-NEXT: sil @$s4main21usesNestedInExtensionyyx20nestedprotocolsource5OuterV05InnerdE0RzlF :
+public func usesNestedInExtension(_ x: some Outer.InnerInExtension) {}
diff --git a/test/decl/inherit/initializer.swift b/test/decl/inherit/initializer.swift
@@ -107,7 +107,7 @@ func testClassInGenericFunc<T>(t: T) {
   class A { init(t: T) {} } // expected-error {{type 'A' cannot be nested in generic function 'testClassInGenericFunc(t:)'}}
   class B : A {} // expected-error {{type 'B' cannot be nested in generic function 'testClassInGenericFunc(t:)'}}
 
-  _ = B(t: t)
+  _ = B(t: t) // expected-error {{'B' cannot be constructed because it has no accessible initializers}}
 }
 
 
diff --git a/test/decl/nested/protocol.swift b/test/decl/nested/protocol.swift
diff --git a/test/decl/overload.swift b/test/decl/overload.swift

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ class TypeMemberVisitor : public DeclVisitor<ImplClass, RetTy> {`
`37`	`37`	`}`
`38`	`38`	`BAD_MEMBER(Extension)`
`39`	`39`	`BAD_MEMBER(Import)`
`40`		`- BAD_MEMBER(Protocol)`
`41`	`40`	`BAD_MEMBER(TopLevelCode)`
`42`	`41`	`BAD_MEMBER(Operator)`
`43`	`42`	`BAD_MEMBER(PrecedenceGroup)`
Original file line number	Diff line number	Diff line change
`@@ -2675,10 +2675,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`2675`	`2675`	`return;`
`2676`	`2676`	`}`
`2677`	`2677`
`2678`		`- // We don't support protocols outside the top level of a file.`
`2679`		`- if (isa<ProtocolDecl>(NTD) &&`
`2680`		`- !DC->isModuleScopeContext()) {`
`2681`		`- NTD->diagnose(diag::unsupported_nested_protocol, NTD);`
	`2678`	`+ // We don't support protocols nested in generic contexts.`
	`2679`	`+ // This includes protocols nested in other protocols.`
	`2680`	`+ if (isa<ProtocolDecl>(NTD) && DC->isGenericContext()) {`
	`2681`	`+ if (auto *OuterPD = DC->getSelfProtocolDecl())`
	`2682`	`+ NTD->diagnose(diag::unsupported_nested_protocol_in_protocol, NTD,`
	`2683`	`+ OuterPD);`
	`2684`	`+ else`
	`2685`	`+ NTD->diagnose(diag::unsupported_nested_protocol_in_generic, NTD);`
	`2686`	`+`
`2682`	`2687`	`NTD->setInvalid();`
`2683`	`2688`	`return;`
`2684`	`2689`	`}`
`@@ -2691,6 +2696,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`2691`	`2696`	`} else {`
`2692`	`2697`	`NTD->diagnose(diag::unsupported_type_nested_in_protocol, NTD, proto);`
`2693`	`2698`	`}`
	`2699`	`+ NTD->setInvalid();`
`2694`	`2700`	`}`
`2695`	`2701`	`}`
`2696`	`2702`
`@@ -2704,6 +2710,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {`
`2704`	`2710`	`} else {`
`2705`	`2711`	`NTD->diagnose(diag::unsupported_type_nested_in_generic_closure, NTD);`
`2706`	`2712`	`}`
	`2713`	`+ NTD->setInvalid();`
`2707`	`2714`	`}`
`2708`	`2715`	`}`
`2709`	`2716`	`}`