Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

include/swift/AST/DiagnosticsSema.def

@@ -7290,6 +7290,9 @@ ERROR(macro_expand_circular_reference_unnamed, none,
 NOTE(macro_expand_circular_reference_unnamed_through, none,
      "circular reference expanding %0 macros", (StringRef))
 
+ERROR(accessor_macro_not_single_var, none,
+      "accessor macro %0 can only apply to a single variable", (DeclName))
+
 //------------------------------------------------------------------------------
 // MARK: Noncopyable Types Diagnostics
 //------------------------------------------------------------------------------

lib/Sema/TypeCheckMacros.cpp

@@ -1398,6 +1398,15 @@ bool swift::accessorMacroIntroducesInitAccessor(
 llvm::Optional<unsigned> swift::expandAccessors(AbstractStorageDecl *storage,
                                                 CustomAttr *attr,
                                                 MacroDecl *macro) {
+  if (auto var = dyn_cast<VarDecl>(storage)) {
+    // Check that the variable is part of a single-variable pattern.
+    auto binding = var->getParentPatternBinding();
+    if (binding && binding->getSingleVar() != var) {
+      var->diagnose(diag::accessor_macro_not_single_var, macro->getName());
+      return llvm::None;
+    }
+  }
+
   // Evaluate the macro.
   auto macroSourceFile =
       ::evaluateAttachedMacro(macro, storage, attr,

test/Macros/accessor_macros.swift

@@ -155,3 +155,11 @@ struct HasStoredTests {
   // expected-note@-3 2{{'z' declared here}}
 #endif
 }
+
+
+#if TEST_DIAGNOSTICS
+struct MultipleVars {
+  @AddWillSet var (x, y): (Int, Int) = (0, 0)
+  // expected-error@-1 2{{accessor macro 'AddWillSet()' can only apply to a single variable}}
+}
+#endif