Merge pull request #59783 from xedin/rdar-95084142-5.7

[5.7][AST] Teach `computeNominalType` about nested ObjC protocols

Author: xedin

lib/AST/Decl.cpp

@@ -4249,7 +4249,11 @@ static Type computeNominalType(NominalTypeDecl *decl, DeclTypeKind kind) {
   // If `decl` is a nested type, find the parent type.
   Type ParentTy;
   DeclContext *dc = decl->getDeclContext();
-  if (!isa<ProtocolDecl>(decl) && dc->isTypeContext()) {
+  bool isObjCProtocol = isa<ProtocolDecl>(decl) && decl->hasClangNode();
+
+  // Objective-C protocols, unlike Swift protocols, could be nested
+  // in other types.
+  if ((isObjCProtocol || !isa<ProtocolDecl>(decl)) && dc->isTypeContext()) {
     switch (kind) {
     case DeclTypeKind::DeclaredType: {
       if (auto *nominal = dc->getSelfNominalTypeDecl())

test/ClangImporter/Inputs/nested_protocol_name.h

@@ -1,9 +1,12 @@
+@import Foundation;
+
 @protocol TrunkBranchProtocol;
 
 __attribute__((objc_root_class))
 @interface Trunk
 - (instancetype)init;
 - (void)addLimb:(id<TrunkBranchProtocol>)limb;
+- (void)addLimbs:(NSArray<id<TrunkBranchProtocol>> *)limbs;
 @end
 
 // NS_SWIFT_NAME(Trunk.Branch)

test/ClangImporter/nested_protocol_name.swift

@@ -11,8 +11,9 @@
 
 // HEADER: class Trunk {
 // HEADER:   init!()
-// HEADER:   class func addLimb(_ limb: Branch!)
-// HEADER:   func addLimb(_ limb: Branch!)
+// HEADER:   class func addLimb(_ limb: Trunk.Branch!)
+// HEADER:   func addLimb(_ limb: Trunk.Branch!)
+// HEADER:   func addLimbs(_ limbs: [Trunk.Branch]!)
 // HEADER: }
 // HEADER: // NS_SWIFT_NAME(Trunk.Branch)
 // HEADER: protocol Branch {
@@ -24,6 +25,11 @@ func grow(_ branch: Trunk.Branch, from trunk: Trunk) {
   trunk.addLimb(branch)
 }
 
+// rdar://95084142 - crash while matching existential types
+func grow_multiple(_ branches: [Trunk.Branch], from trunk: Trunk) {
+  trunk.addLimbs(branches) // ok
+}
+
 class SturdyBranch: Trunk.Branch {
   func flower() {}
 }