[NFC] Sema: Move diagnosis of super in illegal context from CSGen to PreCheckExpr

Author: AnthonyLatsis

lib/Sema/CSGen.cpp

@@ -1607,9 +1607,22 @@ namespace {
         return E->getType();
 
       // Resolve the super type of 'self'.
-      return getSuperType(E->getSelf(), E->getLoc(),
-                          diag::super_invalid_context,
-                          diag::super_no_superclass);
+      auto *selfDecl = E->getSelf();
+
+      DeclContext *typeContext = selfDecl->getDeclContext()->getParent();
+      assert(typeContext);
+
+      auto selfTy =
+          CS.DC->mapTypeIntoContext(typeContext->getDeclaredInterfaceType());
+      auto superclassTy = selfTy->getSuperclass();
+
+      if (!superclassTy)
+        return Type();
+
+      if (selfDecl->getInterfaceType()->is<MetatypeType>())
+        superclassTy = MetatypeType::get(superclassTy);
+
+      return superclassTy;
     }
 
     Type
@@ -3298,39 +3311,6 @@ namespace {
       return resultType;
     }
 
-    Type getSuperType(VarDecl *selfDecl, SourceLoc diagLoc,
-                      Diag<> diag_not_in_class,
-                      Diag<bool, const ClassDecl *> diag_no_superclass) {
-      DeclContext *typeContext = selfDecl->getDeclContext()->getParent();
-      assert(typeContext && "constructor without parent context?!");
-
-      auto &de = CS.getASTContext().Diags;
-      ClassDecl *classDecl = typeContext->getSelfClassDecl();
-      if (!classDecl) {
-        de.diagnose(diagLoc, diag_not_in_class);
-        return Type();
-      }
-      if (!classDecl->hasSuperclass()) {
-        de.diagnose(
-            diagLoc, diag_no_superclass,
-            /*isExtension*/ isa<ExtensionDecl>(typeContext->getAsDecl()),
-            classDecl);
-        return Type();
-      }
-
-      auto selfTy = CS.DC->mapTypeIntoContext(
-        typeContext->getDeclaredInterfaceType());
-      auto superclassTy = selfTy->getSuperclass();
-
-      if (!superclassTy)
-        return Type();
-
-      if (selfDecl->getInterfaceType()->is<MetatypeType>())
-        superclassTy = MetatypeType::get(superclassTy);
-
-      return superclassTy;
-    }
-    
     Type visitRebindSelfInConstructorExpr(RebindSelfInConstructorExpr *expr) {
       // The result is void.
       return TupleType::getEmpty(CS.getASTContext());

lib/Sema/PreCheckExpr.cpp

@@ -1821,6 +1821,12 @@ VarDecl *PreCheckExpression::getImplicitSelfDeclForSuperContext(SourceLoc Loc) {
     } else if (!methodContext) {
       Ctx.Diags.diagnose(Loc, diag::super_invalid_context);
       return nullptr;
+    } else if (!classDecl->hasSuperclass()) {
+      Ctx.Diags.diagnose(
+          Loc, diag::super_no_superclass,
+          /*isExtension*/ isa<ExtensionDecl>(typeContext->getAsDecl()),
+          classDecl);
+      return nullptr;
     }
   } else {
     Ctx.Diags.diagnose(Loc, diag::super_invalid_context);