Merge pull request #35485 from slavapestov/fix-crash-with-invalid-superclass-5.4

Sema: Fix a couple of crash-on-invalid problems with class inheritance [5.4]

Author: slavapestov

lib/Sema/CodeSynthesis.cpp

@@ -62,6 +62,12 @@ Expr *swift::buildSelfReference(VarDecl *selfDecl,
       selfTy = metaTy->getInstanceType();
     }
     selfTy = selfTy->getSuperclass();
+    if (!selfTy) {
+      // Error recovery path. We end up here if getSuperclassDecl() succeeds
+      // but getSuperclass() fails (because, for instance, a generic parameter
+      // of a generic nominal type cannot be resolved).
+      selfTy = ErrorType::get(ctx);
+    }
     if (isMetatype)
       selfTy = MetatypeType::get(selfTy);
 
@@ -70,7 +76,7 @@ Expr *swift::buildSelfReference(VarDecl *selfDecl,
 
     // If no conversion type was specified, or we're already at that type, we're
     // done.
-    if (!convertTy || convertTy->isEqual(selfTy))
+    if (!convertTy || convertTy->isEqual(selfTy) || selfTy->is<ErrorType>())
       return superRef;
 
     // Insert the appropriate expr to handle the upcast.

lib/Sema/TypeCheckNameLookup.cpp

@@ -151,12 +151,12 @@ namespace {
       auto conformance = DC->getParentModule()->lookupConformance(
           conformingType, foundProto);
       if (conformance.isInvalid()) {
-        // If there's no conformance, we have an existential
-        // and we found a member from one of the protocols, and
-        // not a class constraint if any.
-        assert(foundInType->isExistentialType() || foundInType->hasError());
-        if (foundInType->isExistentialType())
+        if (foundInType->isExistentialType()) {
+          // If there's no conformance, we have an existential
+          // and we found a member from one of the protocols, and
+          // not a class constraint if any.
           addResult(found);
+        }
         return;
       }
 

lib/Sema/TypeCheckStorage.cpp

@@ -717,10 +717,16 @@ static Expr *buildStorageReference(AccessorDecl *accessor,
       // Adjust the self type of the access to refer to the relevant superclass.
       auto *baseClass = override->getDeclContext()->getSelfClassDecl();
       selfTypeForAccess = selfTypeForAccess->getSuperclassForDecl(baseClass);
-      subs =
-        selfTypeForAccess->getContextSubstitutionMap(
-          accessor->getParentModule(),
-          baseClass);
+
+      // Error recovery path. We get an ErrorType here if getSuperclassForDecl()
+      // fails (because, for instance, a generic parameter of a generic nominal
+      // type cannot be resolved).
+      if (!selfTypeForAccess->is<ErrorType>()) {
+        subs =
+          selfTypeForAccess->getContextSubstitutionMap(
+            accessor->getParentModule(),
+            baseClass);
+      }
 
       storage = override;
 

validation-test/compiler_crashers_2_fixed/rdar73169149.swift

@@ -0,0 +1,26 @@
+// RUN: not %target-swift-frontend -emit-ir %s
+
+public protocol Ungulate {
+  func eat()
+}
+
+public class Horse<T> : Ungulate {
+  public var saddle: AnyObject? = nil
+
+  public func eat() {}
+}
+
+public struct Hay {}
+
+// Here, ClassDecl::getSuperclassDecl() will find the 'Horse' class, but
+// ClassDecl::getSuperclass() will return ErrorType because the generic
+// argument 'DoesNotExist' cannot be resolved.
+public class Pony : Horse<DoesNotExist> {
+  public override var saddle: AnyObject? {
+    didSet {}
+  }
+
+  public func eat(_: Hay) {
+    eat()
+  }
+}