[Macros] Pass a qualified extended type to extension macro expansion.

Author: hborla

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -704,6 +704,8 @@ func expandAttachedMacro(
   macroKind: UInt8,
   discriminatorText: UnsafePointer<UInt8>,
   discriminatorTextLength: Int,
+  qualifiedTypeText: UnsafePointer<UInt8>,
+  qualifiedTypeLength: Int,
   rawMacroRole: UInt8,
   customAttrSourceFilePtr: UnsafeRawPointer,
   customAttrSourceLocPointer: UnsafePointer<UInt8>?,
@@ -755,6 +757,12 @@ func expandAttachedMacro(
   )
   let discriminator = String(decoding: discriminatorBuffer, as: UTF8.self)
 
+  let qualifiedTypeBuffer = UnsafeBufferPointer(
+    start: qualifiedTypeText, count: qualifiedTypeLength
+  )
+  let qualifiedType = String(decoding: qualifiedTypeBuffer, as: UTF8.self)
+
+
   let expandedSource: String?
   switch MacroPluginKind(rawValue: macroKind)! {
   case .Executable:
@@ -763,6 +771,7 @@ func expandAttachedMacro(
       macroPtr: macroPtr,
       rawMacroRole: rawMacroRole,
       discriminator: discriminator,
+      qualifiedType: qualifiedType,
       customAttrSourceFilePtr: customAttrSourceFilePtr,
       customAttrNode: customAttrNode,
       declarationSourceFilePtr: declarationSourceFilePtr,
@@ -775,6 +784,7 @@ func expandAttachedMacro(
       macroPtr: macroPtr,
       rawMacroRole: rawMacroRole,
       discriminator: discriminator,
+      qualifiedType: qualifiedType,
       customAttrSourceFilePtr: customAttrSourceFilePtr,
       customAttrNode: customAttrNode,
       declarationSourceFilePtr: declarationSourceFilePtr,
@@ -795,6 +805,7 @@ func expandAttachedMacroIPC(
   macroPtr: UnsafeRawPointer,
   rawMacroRole: UInt8,
   discriminator: String,
+  qualifiedType: String,
   customAttrSourceFilePtr: UnsafePointer<ExportedSourceFile>,
   customAttrNode: AttributeSyntax,
   declarationSourceFilePtr: UnsafePointer<ExportedSourceFile>,
@@ -840,6 +851,7 @@ func expandAttachedMacroIPC(
     macro: .init(moduleName: macro.moduleName, typeName: macro.typeName, name: macroName),
     macroRole: macroRole,
     discriminator: discriminator,
+    qualifiedType: qualifiedType,
     attributeSyntax: customAttributeSyntax,
     declSyntax: declSyntax,
     parentDeclSyntax: parentDeclSyntax)
@@ -906,6 +918,7 @@ func expandAttachedMacroInProcess(
   macroPtr: UnsafeRawPointer,
   rawMacroRole: UInt8,
   discriminator: String,
+  qualifiedType: String,
   customAttrSourceFilePtr: UnsafePointer<ExportedSourceFile>,
   customAttrNode: AttributeSyntax,
   declarationSourceFilePtr: UnsafePointer<ExportedSourceFile>,
@@ -951,13 +964,15 @@ func expandAttachedMacroInProcess(
   )
   let declarationNode = sourceManager.detach(declarationNode)
   let parentDeclNode = parentDeclNode.map { sourceManager.detach($0) }
+  let extendedType: TypeSyntax = "\(raw: qualifiedType)"
 
   return SwiftSyntaxMacroExpansion.expandAttachedMacro(
     definition: macro,
     macroRole: MacroRole(rawMacroRole: rawMacroRole),
     attributeNode: attributeNode,
     declarationNode: declarationNode,
     parentDeclNode: parentDeclNode,
+    extendedType: extendedType,
     in: context
   )
 }

lib/ASTGen/Sources/ASTGen/PluginMessages.swift

@@ -32,6 +32,7 @@ internal enum HostToPluginMessage: Codable {
     macro: PluginMessage.MacroReference,
     macroRole: PluginMessage.MacroRole,
     discriminator: String,
+    qualifiedType: String,
     attributeSyntax: PluginMessage.Syntax,
     declSyntax: PluginMessage.Syntax,
     parentDeclSyntax: PluginMessage.Syntax?

lib/Sema/TypeCheckMacros.cpp

@@ -74,6 +74,7 @@ extern "C" ptrdiff_t swift_ASTGen_expandFreestandingMacro(
 extern "C" ptrdiff_t swift_ASTGen_expandAttachedMacro(
     void *diagEngine, void *macro, uint8_t externalKind,
     const char *discriminator, ptrdiff_t discriminatorLength,
+    const char *qualifiedType, ptrdiff_t qualifiedTypeLength,
     uint8_t rawMacroRole,
     void *customAttrSourceFile, const void *customAttrSourceLocation,
     void *declarationSourceFile, const void *declarationSourceLocation,
@@ -1152,6 +1153,19 @@ static SourceFile *evaluateAttachedMacro(MacroDecl *macro, Decl *attachedTo,
 #endif
   });
 
+  std::string extendedType;
+  {
+    llvm::raw_string_ostream OS(extendedType);
+    if (role == MacroRole::Extension) {
+      auto *nominal = dyn_cast<NominalTypeDecl>(attachedTo);
+      PrintOptions options;
+      options.FullyQualifiedExtendedTypesIfAmbiguous = true;
+      nominal->getDeclaredType()->print(OS, options);
+    } else {
+      OS << "";
+    }
+  }
+
   auto macroDef = macro->getDefinition();
   switch (macroDef.kind) {
   case MacroDefinition::Kind::Undefined:
@@ -1223,8 +1237,10 @@ static SourceFile *evaluateAttachedMacro(MacroDecl *macro, Decl *attachedTo,
     ptrdiff_t evaluatedSourceLength;
     swift_ASTGen_expandAttachedMacro(
         &ctx.Diags, externalDef->opaqueHandle,
-        static_cast<uint32_t>(externalDef->kind), discriminator->data(),
-        discriminator->size(), getRawMacroRole(role),
+        static_cast<uint32_t>(externalDef->kind),
+        discriminator->data(), discriminator->size(),
+        extendedType.data(), extendedType.size(),
+        getRawMacroRole(role),
         astGenAttrSourceFile, attr->AtLoc.getOpaquePointerValue(),
         astGenDeclSourceFile, searchDecl->getStartLoc().getOpaquePointerValue(),
         astGenParentDeclSourceFile, parentDeclLoc, &evaluatedSourceAddress,

test/Macros/macro_expand_extensions.swift

@@ -39,3 +39,18 @@ func requiresP(_ value: (some P).Type) {
 
 // CHECK: Wrapped.requirement
 requiresP(Generic<Wrapped>.self)
+
+struct Outer {
+  @DelegatedConformance
+  struct Nested<Element> {}
+}
+
+// CHECK-DUMP: @__swiftmacro_23macro_expand_extensions5OuterV6Nested20DelegatedConformancefMe_.swift
+// CHECK-DUMP: extension Outer.Nested: P where Element: P {
+// CHECK-DUMP:   static func requirement() {
+// CHECK-DUMP:     Element.requirement()
+// CHECK-DUMP:   }
+// CHECK-DUMP: }
+
+// CHECK: Wrapped.requirement
+requiresP(Outer.Nested<Wrapped>.self)