Merge pull request #64942 from DougGregor/sil-symbol-visitor-aux-decls

Author: DougGregor

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -390,7 +390,7 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
   void visit(FileUnit *file) {
     auto visitFile = [this](FileUnit *file) {
       SmallVector<Decl *, 16> decls;
-      file->getTopLevelDecls(decls);
+      file->getTopLevelDeclsWithAuxiliaryDecls(decls);
 
       addMainIfNecessary(file);
 

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -1253,6 +1253,20 @@ public struct DefineStructWithUnqualifiedLookupMacro: DeclarationMacro {
   }
 }
 
+extension TupleExprElementListSyntax {
+  /// Retrieve the first element with the given label.
+  func first(labeled name: String) -> Element? {
+    return first { element in
+      if let label = element.label, label.text == name {
+        return true
+      }
+
+      return false
+    }
+  }
+}
+
+
 public struct DefineAnonymousTypesMacro: DeclarationMacro {
   public static func expansion(
     of node: some FreestandingMacroExpansionSyntax,
@@ -1261,13 +1275,22 @@ public struct DefineAnonymousTypesMacro: DeclarationMacro {
     guard let body = node.trailingClosure else {
       throw CustomError.message("#anonymousTypes macro requires a trailing closure")
     }
+
+    let accessSpecifier: String
+    if let _ = node.argumentList.first(labeled: "public") {
+      accessSpecifier = "public "
+    } else {
+      accessSpecifier = ""
+    }
     return [
       """
 
-      class \(context.makeUniqueName("name")) {
-        func hello() -> String {
+      \(raw:accessSpecifier)class \(context.makeUniqueName("name")) {
+        \(raw:accessSpecifier)func hello() -> String {
           \(body.statements)
         }
+
+        \(raw:accessSpecifier)func getSelf() -> Any.Type { return Self.self }
       }
       """,
       """

test/Macros/top_level_freestanding.swift

@@ -26,11 +26,11 @@ func lookupGlobalFreestandingExpansion() {
 }
 
 @freestanding(declaration)
-macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition", type: "DefineAnonymousTypesMacro")
+macro anonymousTypes(public: Bool = false, _: () -> String) = #externalMacro(module: "MacroDefinition", type: "DefineAnonymousTypesMacro")
 
-#anonymousTypes { "hello" }
+#anonymousTypes(public: true) { "hello" }
 
-// CHECK-SIL: sil hidden @$s9MacroUser03$s9A71User33_082AE7CFEFA6960C804A9FE7366EB5A0Ll14anonymousTypesfMf0_4namefMu_C5helloSSyF
+// CHECK-SIL: sil @$s9MacroUser03$s9A71User33_082AE7CFEFA6960C804A9FE7366EB5A0Ll14anonymousTypesfMf0_4namefMu_C5helloSSyF
 
 @main
 struct Main {

test/SourceKit/Macros/macro_basic.swift

@@ -131,6 +131,7 @@ macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition"
 // EXPAND_MACRO_DECL-NEXT:   func hello() -> String {
 // EXPAND_MACRO_DECL-NEXT:     "hello"
 // EXPAND_MACRO_DECL-NEXT:   }
+// EXPAND_MACRO_DECL:        func getSelf() -> Any.Type { return Self.self }
 // EXPAND_MACRO_DECL-NEXT: }
 // EXPAND_MACRO_DECL-NEXT: enum $s9MacroUser33_70D4178875715FB9B8B50C58F66F8D53Ll14anonymousTypesfMf0_4namefMu0_ {
 // EXPAND_MACRO_DECL-NEXT:   case apple