Merge pull request #14849 from DougGregor/lookup-conformance-via-superclass-bound

Author: swift-ci

lib/AST/SubstitutionMap.cpp

@@ -192,9 +192,19 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {
 
   auto genericSig = getGenericSignature();
 
-  // If the type doesn't conform to this protocol, fail.
-  if (!genericSig->conformsToProtocol(type, proto))
+  // If the type doesn't conform to this protocol, the result isn't formed
+  // from these requirements.
+  if (!genericSig->conformsToProtocol(type, proto)) {
+    // Check whether the superclass conforms.
+    if (auto superclass = genericSig->getSuperclassBound(type)) {
+      return LookUpConformanceInSignature(*getGenericSignature())(
+                                                 type->getCanonicalType(),
+                                                 superclass,
+                                                 proto->getDeclaredType());
+    }
+
     return None;
+  }
 
   auto accessPath =
     genericSig->getConformanceAccessPath(type, proto);

validation-test/compiler_crashers_2_fixed/0144-sr7072.swift

@@ -0,0 +1,31 @@
+// RUN: %target-swift-frontend %s -emit-sil -o - | %FileCheck %s
+
+public final class GenClass<Element: Cl> {
+    public subscript(index: Int) -> Element {
+        get { return unsafeBitCast(0, to: Element.self) }
+    }
+}
+
+public protocol Proto { }
+
+public struct Iter<Element: Proto>: IteratorProtocol {
+    public mutating func next() -> Element? { return nil }
+}
+
+extension GenClass: RandomAccessCollection {
+    public func makeIterator() -> Iter<Element> { return Iter() }
+    public var startIndex: Int { return 0 }
+    public var endIndex: Int { return 0 }
+}
+
+open class Cl: Proto { }
+
+class Bar: Cl {
+    var x: Int?
+}
+
+// CHECK-LABEL: sil hidden @$S4main5crash4barsSbAA8GenClassCyAA3BarCG_tF
+func crash(bars: GenClass<Bar>) -> Bool {
+    // CHECK: apply [[FN:%.*]]<Bar, [Bar]>
+    return Array(bars.filter { $0.x == nil }).isEmpty
+}