Merge pull request #65442 from DougGregor/macro-name-back-ticked-init-as-init

Author: DougGregor

lib/AST/Decl.cpp

@@ -10307,6 +10307,15 @@ void MacroDecl::getIntroducedNames(MacroRole role, ValueDecl *attachedTo,
     switch (expandedName.getKind()) {
     case MacroIntroducedDeclNameKind::Named: {
       names.push_back(DeclName(expandedName.getName()));
+
+      // Temporary hack: we previously allowed named(`init`) to mean the same
+      // thing as named(init), before the latter was supported. Smooth over the
+      // difference by treating the former as the latter, for a short time.
+      if (expandedName.getName().isSimpleName() &&
+          !expandedName.getName().getBaseName().isSpecial() &&
+          expandedName.getName().getBaseIdentifier().is("init"))
+        names.push_back(DeclName(DeclBaseName::createConstructor()));
+
       break;
     }
 

test/Macros/macro_expand_synthesized_members.swift

@@ -13,6 +13,12 @@
 )
 macro addMembers() = #externalMacro(module: "MacroDefinition", type: "AddMembers")
 
+@attached(
+  member,
+  names: named(`init`), named(Storage), named(storage), named(getStorage()), named(method)
+)
+macro addMembersQuotedInit() = #externalMacro(module: "MacroDefinition", type: "AddMembers")
+
 @addMembers
 struct S {
   func useSynthesized() {
@@ -89,3 +95,11 @@ enum ElementType {
 }
 
 print(ElementType.paper.unknown())
+
+@addMembersQuotedInit
+struct S2 {
+  func useSynthesized() {
+    S.method()
+    print(type(of: getStorage()))
+  }
+}