Merge pull request #33083 from xedin/rdar-50819554

[CSGen] Add a null check to prevent using invalid superclass type

Author: xedin

lib/Sema/CSGen.cpp

@@ -2954,6 +2954,9 @@ namespace {
         typeContext->getDeclaredInterfaceType());
       auto superclassTy = selfTy->getSuperclass();
 
+      if (!superclassTy)
+        return Type();
+
       if (selfDecl->getInterfaceType()->is<MetatypeType>())
         superclassTy = MetatypeType::get(superclassTy);
 

test/Constraints/super_method.swift

@@ -59,3 +59,12 @@ func use_d(_ d: D) -> Int {
 func not_method() {
   super.foo() // expected-error{{'super' cannot be used outside of class members}}
 }
+
+// rdar://problem/50819554 - inability to properly resolve superclass shouldn't crash the solver
+func test_that_invalid_supertype_ref_doesnt_crash() {
+  final class Node: ManagedBuffer<AnyObject, Undefined> { // expected-error {{cannot find type 'Undefined' in scope}}
+    static func create() {
+      super.create()
+    }
+  }
+}