Sema: Remove setAccess() call from prepareGenericParamList()

Author: slavapestov

lib/AST/AccessRequests.cpp

@@ -63,6 +63,14 @@ AccessLevelRequest::evaluate(Evaluator &evaluator, ValueDecl *D) const {
     }
   }
 
+  DeclContext *DC = D->getDeclContext();
+
+  // Special case for generic parameters; we just give them a dummy
+  // access level.
+  if (auto genericParam = dyn_cast<GenericTypeParamDecl>(D)) {
+    return AccessLevel::Internal;
+  }
+
   // Special case for associated types: inherit access from protocol.
   if (auto assocType = dyn_cast<AssociatedTypeDecl>(D)) {
     auto prot = assocType->getProtocol();
@@ -80,7 +88,6 @@ AccessLevelRequest::evaluate(Evaluator &evaluator, ValueDecl *D) const {
     }
   }
 
-  DeclContext *DC = D->getDeclContext();
   switch (DC->getContextKind()) {
   case DeclContextKind::TopLevelCodeDecl:
     // Variables declared in a top-level 'guard' statement can be accessed in

lib/Sema/TypeCheckGeneric.cpp

@@ -132,21 +132,10 @@ TypeChecker::gatherGenericParamBindingsText(
 void
 TypeChecker::prepareGenericParamList(GenericParamList *gp,
                                      DeclContext *dc) {
-  AccessLevel access;
-  if (auto *fd = dyn_cast<FuncDecl>(dc))
-    access = fd->getFormalAccess();
-  else if (auto *nominal = dyn_cast<NominalTypeDecl>(dc))
-    access = nominal->getFormalAccess();
-  else
-    access = AccessLevel::Internal;
-  access = std::max(access, AccessLevel::Internal);
-
   unsigned depth = gp->getDepth();
   for (auto paramDecl : *gp) {
     checkDeclAttributesEarly(paramDecl);
     paramDecl->setDepth(depth);
-    if (!paramDecl->hasAccess())
-      paramDecl->setAccess(access);
   }
 }