add Synchronization and Cxx modules to macOS stdlib

Author: tayloraswift

Sources/SymbolGraphBuilder/Standard library/SSGC.StandardLibrary.swift

@@ -25,6 +25,7 @@ extension SSGC.StandardLibrary
         {
         case (.linux, .v(6, 0)):    self = .linux_6_0
         case (.linux, _):           self = .linux_5_10
+        case (.macOS, .v(6, 0)):    self = .macOS_6_0
         case (.macOS, _):           self = .macOS_5_10
         default:                    fatalError("Unsupported platform: \(platform)")
         }
@@ -132,6 +133,54 @@ extension SSGC.StandardLibrary
                     dependencies: 0),
             ])
     }
+}
+extension SSGC.StandardLibrary
+{
+    static var macOS_6_0:Self
+    {
+        .init(
+            products: [
+                .init(name: "__stdlib__", type: .library(.automatic),
+                    dependencies: [],
+                    cultures: [Int].init(0 ... 6)),
+                .init(name: "__corelibs__", type: .library(.automatic),
+                    dependencies: [],
+                    cultures: [Int].init(0 ... 9)),
+            ],
+            modules: [
+                //  0:
+                .toolchain(module: "Swift"),
+                //  1:
+                .toolchain(module: "_Concurrency",
+                    dependencies: 0),
+                //  2:
+                .toolchain(module: "Distributed",
+                    dependencies: 0, 1),
+
+                //  3:
+                .toolchain(module: "_StringProcessing",
+                    dependencies: 0),
+                //  4:
+                .toolchain(module: "RegexBuilder",
+                    dependencies: 0, 3),
+                //  5:
+                .toolchain(module: "Synchronization",
+                    dependencies: 0),
+                //  6:
+                .toolchain(module: "Cxx",
+                    dependencies: 0),
+
+                //  7:
+                .toolchain(module: "Dispatch",
+                    dependencies: 0),
+                //  8:
+                .toolchain(module: "DispatchIntrospection",
+                    dependencies: 0, 7),
+                //  9:
+                .toolchain(module: "Foundation",
+                    dependencies: 0, 7, 8),
+            ])
+    }
 
     static var linux_6_0:Self
     {
@@ -179,7 +228,7 @@ extension SSGC.StandardLibrary
                     dependencies: 0),
                 // 10:
                 .toolchain(module: "DispatchIntrospection",
-                    dependencies: 0),
+                    dependencies: 0, 9),
                 // 11:
                 .toolchain(module: "FoundationEssentials",
                     dependencies: 0, 4, 5, 9),

Sources/SymbolGraphBuilder/Toolchains/SSGC.Toolchain.SymbolDumpOptions.swift

@@ -5,19 +5,16 @@ extension SSGC.Toolchain
     struct SymbolDumpOptions
     {
         var minimumACL:Symbol.ACL
-        var allowedReexportedModules:[Symbol.Module]
         var emitExtensionBlockSymbols:Bool
         var includeInterfaceSymbols:Bool
         var skipInheritedDocs:Bool
 
         init(minimumACL:Symbol.ACL = .internal,
-            allowedReexportedModules:[Symbol.Module] = [],
             emitExtensionBlockSymbols:Bool = true,
             includeInterfaceSymbols:Bool = true,
             skipInheritedDocs:Bool = true)
         {
             self.minimumACL = minimumACL
-            self.allowedReexportedModules = allowedReexportedModules
             self.emitExtensionBlockSymbols = emitExtensionBlockSymbols
             self.includeInterfaceSymbols = includeInterfaceSymbols
             self.skipInheritedDocs = skipInheritedDocs

Sources/SymbolGraphBuilder/Toolchains/SSGC.Toolchain.swift

@@ -218,13 +218,7 @@ extension SSGC.Toolchain
     /// this methods disables extension block symbols by default.
     func dump(
         standardLibrary:SSGC.StandardLibrary,
-        options:SymbolDumpOptions = .init(allowedReexportedModules: [
-                "_Concurrency",
-                "_StringProcessing",
-                "FoundationEssentials",
-                "FoundationInternationalization",
-            ],
-            emitExtensionBlockSymbols: false),
+        options:SymbolDumpOptions = .init(emitExtensionBlockSymbols: false),
         cache:FilePath.Directory) throws -> FilePath.Directory
     {
         let cached:FilePath.Directory = cache / "swift@\(self.splash.swift.version)"
@@ -234,9 +228,16 @@ extension SSGC.Toolchain
             let temporary:FilePath.Directory = cache / "swift"
             try temporary.create(clean: true)
 
+            var dumped:[Symbol.Module] = []
+
             for module:SymbolGraph.Module in standardLibrary.modules
             {
-                try self.dump(module: module.id, to: temporary, options: options)
+                try self.dump(module: module.id,
+                    to: temporary,
+                    options: options,
+                    allowedReexportedModules: dumped)
+
+                dumped.append(module.id)
             }
 
             try temporary.move(replacing: cached)
@@ -250,7 +251,8 @@ extension SSGC.Toolchain
     func dump(module id:Symbol.Module,
         to output:FilePath.Directory,
         options:SymbolDumpOptions,
-        include:[FilePath.Directory] = []) throws
+        include:[FilePath.Directory] = [],
+        allowedReexportedModules:[Symbol.Module] = []) throws
     {
         print("Dumping symbols for module '\(id)'")
 
@@ -278,12 +280,9 @@ extension SSGC.Toolchain
         {
             arguments.append("-skip-inherited-docs")
         }
-        if  self.splash.swift.version >= .v(6, 0, 0),
-            //  Temporary hack until we have the right stdlib definitions for macOS
-            self.splash.triple.os.starts(with: "linux"),
-            !options.allowedReexportedModules.isEmpty
+        if  self.splash.swift.version >= .v(6, 0, 0), !allowedReexportedModules.isEmpty
         {
-            let whitelist:String = options.allowedReexportedModules.lazy.map { "\($0)" }.joined(
+            let whitelist:String = allowedReexportedModules.lazy.map { "\($0)" }.joined(
                 separator: ",")
 
             arguments.append("""