Sema: DeclChecker::visitProtocolDecl() does everything in the 'first pass'

Since protocol members no longer get visited in the 'second pass',
change functions, constructors, associated types and pattern
bindings to check accessibility in the first pass.

Author: slavapestov

lib/Sema/TypeCheckDecl.cpp

@@ -4260,10 +4260,10 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       });
     }
 
-    if (!IsFirstPass)
-      checkAccessControl(TC, PBD);
-
     TC.checkDeclAttributes(PBD);
+
+    if (IsFirstPass)
+      checkAccessControl(TC, PBD);
   }
 
   void visitSubscriptDecl(SubscriptDecl *SD) {
@@ -4289,17 +4289,22 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     checkAccessControl(TC, TAD);
   }
 
-  void visitAssociatedTypeDecl(AssociatedTypeDecl *assocType) {
-    if (!assocType->hasValidationStarted())
-      TC.validateDecl(assocType);
+  void visitAssociatedTypeDecl(AssociatedTypeDecl *AT) {
+    if (!IsFirstPass) {
+      return;
+    }
+
+    TC.validateDecl(AT);
 
-    auto *proto = assocType->getProtocol();
+    auto *proto = AT->getProtocol();
     if (proto->isObjC()) {
-      TC.diagnose(assocType->getLoc(),
+      TC.diagnose(AT->getLoc(),
                   diag::associated_type_objc,
-                  assocType->getName(),
+                  AT->getName(),
                   proto->getName());
     }
+
+    checkAccessControl(TC, AT);
   }
 
   void checkUnsupportedNestedType(NominalTypeDecl *NTD) {
@@ -4651,26 +4656,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
   }
 
   void visitProtocolDecl(ProtocolDecl *PD) {
-    TC.checkDeclAttributesEarly(PD);
-    TC.computeAccessLevel(PD);
-
-    if (IsFirstPass) {
-      checkUnsupportedNestedType(PD);
-    }
-
     if (!IsFirstPass) {
-      checkAccessControl(TC, PD);
-      for (auto member : PD->getMembers()) {
-        TC.checkUnsupportedProtocolType(member);
-        checkAccessControl(TC, member);
-      }
-      TC.checkInheritanceClause(PD);
-
-      GenericTypeToArchetypeResolver resolver(PD);
-      TC.validateWhereClauses(PD, &resolver);
       return;
     }
 
+    TC.checkDeclAttributesEarly(PD);
+    TC.computeAccessLevel(PD);
+
+    checkUnsupportedNestedType(PD);
+
     TC.validateDecl(PD);
     if (!PD->hasValidSignature())
       return;
@@ -4706,6 +4700,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     TC.checkDeclAttributes(PD);
 
+    checkAccessControl(TC, PD);
+    for (auto member : PD->getMembers()) {
+      TC.checkUnsupportedProtocolType(member);
+    }
+    TC.checkInheritanceClause(PD);
+
+    GenericTypeToArchetypeResolver resolver(PD);
+    TC.validateWhereClauses(PD, &resolver);
+
     if (TC.Context.LangOpts.DebugGenericSignatures) {
       auto requirementsSig =
         GenericSignature::get({PD->getProtocolSelfType()},
@@ -4772,14 +4775,12 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         // Complain if we should have a body.
         TC.diagnose(FD->getLoc(), diag::func_decl_without_brace);
       }
-    }
 
-    if (!IsFirstPass) {
-      checkAccessControl(TC, FD);
       return;
     }
 
     TC.validateDecl(FD);
+    checkAccessControl(TC, FD);
   }
 
 
@@ -6300,7 +6301,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     }
 
     if (!IsFirstPass) {
-      checkAccessControl(TC, CD);
       return;
     }
 
@@ -6347,6 +6347,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     }
 
     TC.checkDeclAttributes(CD);
+    checkAccessControl(TC, CD);
   }
 
   void visitDestructorDecl(DestructorDecl *DD) {