Ensure that we wire up *all* custom attribute initializer contexts

Thank you again, Rintaro

Author: DougGregor

include/swift/AST/Attr.h

@@ -3065,10 +3065,6 @@ class DeclAttributes {
          const_cast<const DeclAttributes *>(this)->getEffectiveSendableAttr());
   }
 
-  /// Try to find the custom attribute initializer within the list of
-  /// attributes.
-  CustomAttributeInitializer *findCustomAttributeInitializer() const;
-
 public:
   template <typename ATTR, bool AllowInvalid>
   using AttributeKindRange =

lib/AST/Attr.cpp

@@ -3148,13 +3148,3 @@ bool swift::hasAttribute(const LangOptions &langOpts,
 
   return false;
 }
-
-CustomAttributeInitializer *
-DeclAttributes::findCustomAttributeInitializer() const {
-  for (auto custom : getAttributes<CustomAttr>()) {
-    if (auto initContext = custom->getInitContext())
-      return initContext;
-  }
-
-  return nullptr;
-}

lib/AST/Decl.cpp

@@ -2063,15 +2063,15 @@ PatternBindingDecl::create(ASTContext &Ctx, SourceLoc StaticLoc,
     // only affect implicit code though.
     if (!initContext && !Parent->isLocalContext()) {
       initContext = PatternBindingInitializer::create(Parent);
-
     }
 
-    if (auto firstVar = PBD->getAnchoringVarDecl(idx)) {
-      if (auto attributeInit =
-              firstVar->getAttrs().findCustomAttributeInitializer()) {
-        attributeInit->setEnclosingInitializer(initContext);
+    // Set up the custom attribute contexts for each variable in this pattern.
+    PBD->getPattern(idx)->forEachVariable([&](VarDecl *var) {
+      for (auto custom : var->getAttrs().getAttributes<CustomAttr>()) {
+        if (auto attributeInit = custom->getInitContext())
+          attributeInit->setEnclosingInitializer(initContext);
       }
-    }
+    });
 
     // We need to call setPattern to ensure the VarDecls in the pattern have
     // the PatternBindingDecl set as their parent. We also need to call

lib/Parse/ParseDecl.cpp

@@ -8598,20 +8598,12 @@ Parser::parseDeclVar(ParseDeclOptions Flags,
 
     // Parse an initializer if present.
     if (Tok.is(tok::equal)) {
-      // If we're not in a local context, we'll need a context to parse initializers
-      // into (should we have one).  This happens for properties and global
-      // variables in libraries.
-
       // If we have no local context to parse the initial value into, create one
       // for the PBD we'll eventually create.  This allows us to have reasonable
       // DeclContexts for any closures that may live inside of initializers.
       if (!CurDeclContext->isLocalContext() && !topLevelDecl) {
         assert(!initContext && "There cannot be an init context yet");
         initContext = PatternBindingInitializer::create(CurDeclContext);
-
-        if (auto attributeInit = Attributes.findCustomAttributeInitializer()) {
-          attributeInit->setEnclosingInitializer(initContext);
-        }
       }
 
       // If we're using a local context (either a TopLevelCodeDecl or a

test/Macros/macro_expand_peers.swift

@@ -299,3 +299,13 @@ struct Trait {
 
 @trait(Trait {})
 func closureInPeerMacroCrash() {}
+
+@trait(Trait {})
+@trait(Trait {})
+@trait(Trait {})
+func closuresInPeerMacroCrash() {}
+
+@trait(Trait {})
+@trait(Trait {})
+@trait(Trait {})
+var closuresInPeerMacroOnVariableCrash: Int = 0