Merge pull request #69448 from DougGregor/member-conformance-list-for-real-5.9

Author: DougGregor

lib/Sema/TypeCheckMacros.cpp

@@ -1239,7 +1239,7 @@ static SourceFile *evaluateAttachedMacro(MacroDecl *macro, Decl *attachedTo,
   std::string conformanceList;
   {
     llvm::raw_string_ostream OS(conformanceList);
-    if (role == MacroRole::Extension) {
+    if (role == MacroRole::Extension || role == MacroRole::Member) {
       llvm::interleave(
           conformances,
           [&](const ProtocolDecl *protocol) {

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -2073,12 +2073,18 @@ extension RequiredDefaultInitMacro: MemberMacro {
     conformingTo protocols: [TypeSyntax],
     in context: some MacroExpansionContext
   ) throws -> [DeclSyntax] {
-    let decl: DeclSyntax
-    if declaration.is(ClassDeclSyntax.self) && protocols.isEmpty {
-      decl = "required init() { }"
+    let initDecl: DeclSyntax
+    let funcDecl: DeclSyntax
+    if !declaration.is(ClassDeclSyntax.self) {
+      initDecl = "init() { }"
+      funcDecl = "func f() { }"
+    } else if !protocols.isEmpty {
+      initDecl = "required init() { }"
+      funcDecl = "func f() { }"
     } else {
-      decl = "init() { }"
+      initDecl = "required init() { }"
+      funcDecl = "override func f() { }"
     }
-    return [ decl ]
+    return [ initDecl, funcDecl ]
   }
 }

test/Macros/macro_expand_member_with_conformances.swift

@@ -9,7 +9,7 @@ protocol DefaultInit {
 }
 
 @attached(extension, conformances: DefaultInit)
-@attached(member, conformances: DefaultInit, names: named(init()))
+@attached(member, conformances: DefaultInit, names: named(init()), named(f()))
 macro DefaultInit() = #externalMacro(module: "MacroDefinition", type: "RequiredDefaultInitMacro")
 
 @DefaultInit