Merge pull request #67189 from hborla/5.9-extension-macro-fixes

[5.9][Macros] A few bug fixes for extension macros.

Author: hborla

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -837,7 +837,7 @@ func expandAttachedMacroIPC(
   }
 
   let conformanceListSyntax: PluginMessage.Syntax?
-  if (qualifiedType.isEmpty) {
+  if (conformanceList.isEmpty) {
     conformanceListSyntax = nil
   } else {
     let placeholderDecl: DeclSyntax =

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -238,6 +238,9 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
   void addConformances(const IterableDeclContext *IDC) {
     for (auto conformance :
          IDC->getLocalConformances(ConformanceLookupKind::NonInherited)) {
+      if (conformance->getSourceKind() == ConformanceEntryKind::PreMacroExpansion)
+        continue;
+
       auto protocol = conformance->getProtocol();
       if (Ctx.getOpts().PublicSymbolsOnly &&
           getDeclLinkage(protocol) != FormalLinkage::PublicUnique)

lib/Sema/TypeCheckMacros.cpp

@@ -1715,6 +1715,10 @@ ResolveExtensionMacroConformances::evaluate(Evaluator &evaluator,
 
       typeExpr->setType(MetatypeType::get(resolved));
       protocols.push_back(resolved);
+    } else {
+      // If there's no type repr, we already have a resolved instance
+      // type, e.g. because the type expr was deserialized.
+      protocols.push_back(typeExpr->getInstanceType());
     }
   }
 

test/Macros/Inputs/macro_library.swift

@@ -28,6 +28,7 @@ public struct ObservationRegistrar<Subject: Observable> {
   names: named(_registrar), named(addObserver), named(removeObserver), named(withTransaction), named(Storage), named(_storage)
 )
 @attached(memberAttribute)
+@attached(extension, conformances: Observable)
 public macro Observable() = #externalMacro(module: "MacroDefinition", type: "ObservableMacro")
 
 @attached(accessor)

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -1195,6 +1195,30 @@ public struct ObservableMacro: MemberMacro, MemberAttributeMacro {
 
 }
 
+extension ObservableMacro: ExtensionMacro {
+  public static func expansion(
+    of node: AttributeSyntax,
+    attachedTo decl: some DeclGroupSyntax,
+    providingExtensionsOf type: some TypeSyntaxProtocol,
+    conformingTo protocols: [TypeSyntax],
+    in context: some MacroExpansionContext
+  ) throws -> [ExtensionDeclSyntax] {
+    if (protocols.isEmpty) {
+      return []
+    }
+
+    let decl: DeclSyntax =
+      """
+      extension \(raw: type.trimmedDescription): Observable {
+      }
+      """
+
+    return [
+      decl.cast(ExtensionDeclSyntax.self)
+    ]
+  }
+}
+
 public struct ObservablePropertyMacro: AccessorMacro {
   public static func expansion(
     of node: AttributeSyntax,

test/Macros/macro_expand_peers.swift

@@ -5,7 +5,7 @@
 // RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -parse-as-library -disable-availability-checking -DTEST_DIAGNOSTICS
 
 // Check with the imported macro library vs. the local declaration of the macro.
-// RUN: %target-swift-frontend -swift-version 5 -emit-module -o %t/macro_library.swiftmodule %S/Inputs/macro_library.swift -module-name macro_library -load-plugin-library %t/%target-library-name(MacroDefinition)
+// RUN: %target-swift-frontend -enable-experimental-feature ExtensionMacros -swift-version 5 -emit-module -o %t/macro_library.swiftmodule %S/Inputs/macro_library.swift -module-name macro_library -load-plugin-library %t/%target-library-name(MacroDefinition)
 
 // RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -parse-as-library -disable-availability-checking -DIMPORT_MACRO_LIBRARY -I %t -DTEST_DIAGNOSTICS
 

test/Macros/macro_expand_primary.swift

@@ -3,7 +3,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %empty-directory(%t-scratch)
 // RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath
-// RUN: %target-swift-frontend -swift-version 5 -emit-module -o %t/macro_library.swiftmodule %S/Inputs/macro_library.swift -module-name macro_library -load-plugin-library %t/%target-library-name(MacroDefinition)
+// RUN: %target-swift-frontend -enable-experimental-feature ExtensionMacros -swift-version 5 -emit-module -o %t/macro_library.swiftmodule %S/Inputs/macro_library.swift -module-name macro_library -load-plugin-library %t/%target-library-name(MacroDefinition)
 // RUN: %target-swift-frontend -swift-version 5 -typecheck -I%t -verify -primary-file %s %S/Inputs/macro_expand_other.swift -verify-ignore-unknown  -load-plugin-library %t/%target-library-name(MacroDefinition) -dump-macro-expansions > %t/expansions-dump.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-DUMP %s < %t/expansions-dump.txt
 
@@ -86,6 +86,14 @@ func test() {
   observeDog()
 }
 
+@Observable
+class Person {
+  init() {}
+}
+
+// CHECK-DUMP: extension Person: Observable {
+// CHECK-DUMP: }
+
 
 @freestanding(declaration, names: named(Foo)) macro useIdentifier(_ value: String) = #externalMacro(module: "MacroDefinition", type: "UseIdentifierMacro")