[AST] NFC: Rename VarDecl::visitAuxiliaryDecls -> visitAuxiliaryVars

Make it more obvious it's different to `Decl::visitAuxiliaryDecls`.

Author: hamishknight

include/swift/AST/Decl.h

@@ -6725,13 +6725,14 @@ class VarDecl : public AbstractStorageDecl {
     Bits.VarDecl.IsDebuggerVar = IsDebuggerVar;
   }
 
-  /// Visit all auxiliary declarations to this VarDecl.
+  /// Visit all auxiliary variables for this VarDecl.
   ///
-  /// An auxiliary declaration is a declaration synthesized by the compiler to support
-  /// this VarDecl, such as synthesized property wrapper variables.
+  /// An auxiliary variable is one that is synthesized by the compiler to
+  /// support this VarDecl, such as synthesized property wrapper variables.
   ///
-  /// \note this function only visits auxiliary decls that are not part of the AST.
-  void visitAuxiliaryDecls(llvm::function_ref<void(VarDecl *)>) const;
+  /// \note this function only visits auxiliary variables that are not part of
+  /// the AST.
+  void visitAuxiliaryVars(llvm::function_ref<void(VarDecl *)>) const;
 
   /// Is this the synthesized storage for a 'lazy' property?
   bool isLazyStorageProperty() const {

lib/AST/Decl.cpp

@@ -507,7 +507,7 @@ void Decl::visitAuxiliaryDecls(
     }
   }
 
-  // FIXME: fold VarDecl::visitAuxiliaryDecls into this.
+  // FIXME: fold VarDecl::visitAuxiliaryVars into this.
 }
 
 void Decl::forEachAttachedMacro(MacroRole role,
@@ -8767,7 +8767,8 @@ bool VarDecl::hasStorageOrWrapsStorage() const {
   return false;
 }
 
-void VarDecl::visitAuxiliaryDecls(llvm::function_ref<void(VarDecl *)> visit) const {
+void VarDecl::visitAuxiliaryVars(
+    llvm::function_ref<void(VarDecl *)> visit) const {
   if (getDeclContext()->isTypeContext() ||
       (isImplicit() && !isa<ParamDecl>(this)))
     return;

lib/AST/UnqualifiedLookup.cpp

@@ -708,7 +708,7 @@ bool ASTScopeDeclConsumerForUnqualifiedLookup::consume(
       bool foundMatch = false;
       if (auto *varDecl = dyn_cast<VarDecl>(value)) {
         // Check if the name matches any auxiliary decls not in the AST
-        varDecl->visitAuxiliaryDecls([&](VarDecl *auxiliaryVar) {
+        varDecl->visitAuxiliaryVars([&](VarDecl *auxiliaryVar) {
           if (auxiliaryVar->ValueDecl::getName().matchesRef(fullName)) {
             value = auxiliaryVar;
             foundMatch = true;
@@ -918,7 +918,7 @@ class ASTScopeDeclConsumerForLocalLookup
       bool foundMatch = false;
       if (auto *varDecl = dyn_cast<VarDecl>(value)) {
         // Check if the name matches any auxiliary decls not in the AST
-        varDecl->visitAuxiliaryDecls([&](VarDecl *auxiliaryVar) {
+        varDecl->visitAuxiliaryVars([&](VarDecl *auxiliaryVar) {
           if (name.isSimpleName(auxiliaryVar->getName())
                 && hasCorrectABIRole(auxiliaryVar)) {
             results.push_back(auxiliaryVar);

lib/SILGen/SILGenDecl.cpp

@@ -1716,7 +1716,7 @@ void SILGenFunction::visitVarDecl(VarDecl *D) {
   }
 
   // Emit lazy and property wrapper backing storage.
-  D->visitAuxiliaryDecls([&](VarDecl *var) {
+  D->visitAuxiliaryVars([&](VarDecl *var) {
     if (auto *patternBinding = var->getParentPatternBinding())
       visitPatternBindingDecl(patternBinding);
 

lib/SILGen/SILGenProlog.cpp

@@ -1064,7 +1064,7 @@ class ArgumentInitHelper {
   void emitParam(ParamDecl *PD) {
     // Register any auxiliary declarations for the parameter to be
     // visited later.
-    PD->visitAuxiliaryDecls([&](VarDecl *localVar) {
+    PD->visitAuxiliaryVars([&](VarDecl *localVar) {
       SGF.LocalAuxiliaryDecls.push_back(localVar);
     });
 

lib/Sema/LookupVisibleDecls.cpp

@@ -1224,8 +1224,7 @@ class ASTScopeVisibleDeclConsumer
           // auxiliary variables (unless 'var' is a closure param).
           (void)var->getPropertyWrapperBackingPropertyType();
         }
-        var->visitAuxiliaryDecls(
-            [&](VarDecl *auxVar) { foundDecl(auxVar); });
+        var->visitAuxiliaryVars([&](VarDecl *auxVar) { foundDecl(auxVar); });
       }
       // NOTE: We don't call Decl::visitAuxiliaryDecls here since peer decls of
       // local decls should not show up in lookup results.

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2382,9 +2382,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     checkGlobalIsolation(VD);
 
     // Visit auxiliary decls first
-    VD->visitAuxiliaryDecls([&](VarDecl *var) {
-      this->visitBoundVariable(var);
-    });
+    VD->visitAuxiliaryVars(
+        [&](VarDecl *var) { this->visitBoundVariable(var); });
 
     // Reject cases where this is a variable that has storage but it isn't
     // allowed.
@@ -4119,7 +4118,7 @@ void TypeChecker::checkParameterList(ParameterList *params,
 
     if (!param->isInvalid()) {
       auto *SF = owner->getParentSourceFile();
-      param->visitAuxiliaryDecls([&](VarDecl *auxiliaryDecl) {
+      param->visitAuxiliaryVars([&](VarDecl *auxiliaryDecl) {
         if (!isa<ParamDecl>(auxiliaryDecl))
           DeclChecker(SF->getASTContext(), SF).visitBoundVariable(auxiliaryDecl);
       });

lib/Sema/TypeCheckStmt.cpp

@@ -153,9 +153,8 @@ namespace {
 
       // Auxiliary decls need to have their contexts adjusted too.
       if (auto *VD = dyn_cast<VarDecl>(D)) {
-        VD->visitAuxiliaryDecls([&](VarDecl *D) {
-          D->setDeclContext(ParentDC);
-        });
+        VD->visitAuxiliaryVars(
+            [&](VarDecl *D) { D->setDeclContext(ParentDC); });
       }
 
       // We don't currently support peer macro declarations in local contexts,