Merge pull request #64132 from hborla/validate-freestanding-macro-expansions

[Macros] Validate freestanding macro expansions.

Author: DougGregor

lib/Sema/TypeCheckMacros.cpp

@@ -913,6 +913,10 @@ swift::expandFreestandingMacro(MacroExpansionDecl *med) {
       /*parsingOpts=*/{}, /*isPrimary=*/false);
   macroSourceFile->setImports(sourceFile->getImports());
 
+  validateMacroExpansion(macroSourceFile, macro,
+                         /*attachedTo*/nullptr,
+                         MacroRole::Declaration);
+
   PrettyStackTraceDecl debugStack(
       "type checking expanded declaration macro", med);
 

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -764,7 +764,7 @@ public struct AddCompletionHandler: PeerMacro {
   }
 }
 
-public struct InvalidMacro: PeerMacro {
+public struct InvalidMacro: PeerMacro, DeclarationMacro {
   public static func expansion(
     of node: AttributeSyntax,
     providingPeersOf declaration: some DeclSyntaxProtocol,
@@ -794,6 +794,15 @@ public struct InvalidMacro: PeerMacro {
       "typealias _FileReferenceLiteralType = Void",
     ]
   }
+
+  public static func expansion(
+    of node: some FreestandingMacroExpansionSyntax,
+    in context: some MacroExpansionContext
+  ) throws -> [DeclSyntax] {
+    return [
+      "var value: Int"
+    ]
+  }
 }
 
 public struct WrapInType: PeerMacro {

test/Macros/macro_expand.swift

@@ -31,6 +31,19 @@
 // REQUIRES: OS=macosx
 
 #if TEST_DIAGNOSTICS
+@freestanding(declaration)
+macro NotCovered() = #externalMacro(module: "MacroDefinition", type: "InvalidMacro")
+
+struct MemberNotCovered {
+  #NotCovered
+  // expected-note@-1 {{in expansion of macro 'NotCovered' here}}
+
+  // CHECK-DIAGS: error: declaration name 'value' is not covered by macro 'NotCovered'
+  // CHECK-DIAGS: CONTENTS OF FILE @__swiftmacro_9MacroUser16MemberNotCoveredV0dE0fMf0_.swift
+  // CHECK-DIAGS: var value: Int
+  // CHECK-DIAGS: END CONTENTS OF FILE
+}
+
 @attached(peer)
 macro Invalid() = #externalMacro(module: "MacroDefinition", type: "InvalidMacro")