Apply access notes before checkDeclAttributes()

There appear to be ways to enter this function without passing through DeclChecker::visit() first.

Author: beccadax

lib/Sema/TypeCheckAttr.cpp

@@ -1130,6 +1130,9 @@ void AttributeChecker::visitOptionalAttr(OptionalAttr *attr) {
 }
 
 void TypeChecker::checkDeclAttributes(Decl *D) {
+  if (auto VD = dyn_cast<ValueDecl>(D))
+    TypeChecker::applyAccessNote(VD);
+  
   AttributeChecker Checker(D);
   // We need to check all OriginallyDefinedInAttr relative to each other, so
   // collect them and check in batch later.

lib/Sema/TypeCheckDeclObjC.cpp

@@ -1483,7 +1483,7 @@ bool IsObjCRequest::evaluate(Evaluator &evaluator, ValueDecl *VD) const {
   DiagnosticStateRAII diagState(VD->getASTContext().Diags);
 
   // Access notes may add attributes that affect this calculus.
-  (void)evaluateOrDefault(evaluator, ApplyAccessNoteRequest{VD}, {});
+  TypeChecker::applyAccessNote(VD);
 
   auto dc = VD->getDeclContext();
   Optional<ObjCReason> isObjC;

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -1514,6 +1514,11 @@ static void applyAccessNote(ValueDecl *VD, const AccessNote &note,
   }
 }
 
+void TypeChecker::applyAccessNote(ValueDecl *VD) {
+  (void)evaluateOrDefault(VD->getASTContext().evaluator,
+                          ApplyAccessNoteRequest{VD}, {});
+}
+
 evaluator::SideEffect
 ApplyAccessNoteRequest::evaluate(Evaluator &evaluator, ValueDecl *VD) const {
   AccessNotesFile &notes = VD->getModuleContext()->getAccessNotes();
@@ -1545,8 +1550,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     PrettyStackTraceDecl StackTrace("type-checking", decl);
 
     if (auto VD = dyn_cast<ValueDecl>(decl))
-      (void)evaluateOrDefault(VD->getASTContext().evaluator,
-                              ApplyAccessNoteRequest{VD}, {});
+      TypeChecker::applyAccessNote(VD);
 
     DeclVisitor<DeclChecker>::visit(decl);
 

lib/Sema/TypeChecker.h

@@ -1184,6 +1184,12 @@ UnresolvedMemberExpr *getUnresolvedMemberChainBase(Expr *expr);
 bool typeSupportsBuilderOp(Type builderType, DeclContext *dc, Identifier fnName,
                            ArrayRef<Identifier> argLabels = {},
                            SmallVectorImpl<ValueDecl *> *allResults = nullptr);
+
+/// Forces all changes specified by the module's access notes file to be
+/// applied to this declaration. It is safe to call this function more than
+/// once.
+void applyAccessNote(ValueDecl *VD);
+
 }; // namespace TypeChecker
 
 /// Temporary on-stack storage and unescaping for encoded diagnostic