Merge pull request #32759 from nate-chandler/rdar64672291

[5.3] [Runtime] Let existential types satisfy superclass requirements.

Author: nate-chandler

stdlib/public/runtime/ProtocolConformance.cpp

@@ -869,6 +869,15 @@ bool swift::_checkGenericRequirements(
                                    substGenericParam, substWitnessTable).getMetadata();
       if (!baseType) return true;
 
+      // If the type which is constrained to a base class is an existential 
+      // type, and if that existential type includes a superclass constraint,
+      // just require that the superclass by which the existential is
+      // constrained is a subclass of the base class.
+      if (auto *existential = dyn_cast<ExistentialTypeMetadata>(subjectType)) {
+        if (auto *superclassConstraint = existential->getSuperclassConstraint())
+          subjectType = superclassConstraint;
+      }
+
       if (!isSubclass(subjectType, baseType))
         return true;
 

validation-test/Runtime/rdar64672291.swift

@@ -0,0 +1,24 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: objc_interop
+
+import Foundation
+
+final class Storage<T: NSObject> {
+    weak var object: T?
+    init(object: T) {
+        self.object = object
+    }
+}
+
+
+@objc protocol MyProtocol {}
+typealias MyStorage = Storage<NSObject & MyProtocol>
+
+class Gadget: NSObject, MyProtocol {
+    func testit() {
+        _ = MyStorage(object: self)
+    }
+}
+
+let gadget = Gadget()
+gadget.testit()