more

Author: ileitch

CHANGELOG.md

@@ -7,8 +7,7 @@
 ##### Enhancements
 
 - Added support for Bazel 9.x.
-- Significant performance improvements. Total runtime scanning the Reddit iOS codebase reduced by 72.6% from 77.2s to 21.2s.
-- Significant performance improvements. Total runtime scanning the Reddit iOS codebase reduced by 74.6% from 77.2s to 19.6s.
+- Significant performance improvements. Total runtime scanning the Reddit iOS codebase reduced by 78.8% from 77.2s to 16.4s.
 
 ##### Bug Fixes
 

Sources/Indexer/SwiftIndexer.swift

@@ -163,8 +163,6 @@ final class SwiftIndexer: Indexer {
         /// phase two.
         func phaseOne() throws {
             var rawDeclsByKey: [RawDeclaration.Key: [(RawDeclaration, [RawRelation])]] = [:]
-            // Array (not Set) to avoid redundant hashing -- deduplication happens
-            // in SourceGraph.allReferences when references are added under the lock.
             var references: [Reference] = []
 
             for unit in units {
@@ -246,11 +244,8 @@ final class SwiftIndexer: Indexer {
             }
 
             try graph.withLock { graph in
-                graph.ensureReferencesCapacity(graph.allReferences.count + references.count)
                 graph.add(references)
                 try graph.add(newDeclarations)
-                // Apply batched retention after insertion so any synthetic
-                // retained references resolve against the completed file graph.
                 graph.markRetained(retainedDecls)
 
                 if retainAllDeclarations {
@@ -260,8 +255,6 @@ final class SwiftIndexer: Indexer {
 
             establishDeclarationHierarchy()
 
-            // Only sort when needed -- associateDanglingReferences is the sole consumer
-            // and it early-exits when there are no dangling references.
             if !danglingReferences.isEmpty {
                 sortedDeclarationsCache = declarations.sorted()
             }
@@ -359,7 +352,6 @@ final class SwiftIndexer: Indexer {
                 for (parent, decls) in childDeclsByParentUsr {
                     guard let parentDecl = graph.declaration(withUsr: parent) else {
                         if varParameterUsrs.contains(parent) {
-                            // These declarations are children of a parameter and are redundant.
                             decls.forEach { graph.remove($0) }
                         }
 
@@ -370,7 +362,7 @@ final class SwiftIndexer: Indexer {
                         decl.parent = parentDecl
                     }
 
-                    parentDecl.declarations.formUnion(decls)
+                    parentDecl.declarations.append(contentsOf: decls)
                 }
             }
         }
@@ -513,17 +505,17 @@ final class SwiftIndexer: Indexer {
                 graph.markCommandIgnored(decl, kind: kind)
                 decl.unusedParameters.forEach { graph.markCommandIgnored($0, kind: kind) }
 
-                commandIgnoreUnsafe(Array(decl.declarations), kind: kind, graph: graph)
+                commandIgnoreUnsafe(decl.declarations, kind: kind, graph: graph)
             }
         }
 
         private func associateUnsafe(_ ref: Reference, with decl: Declaration) {
             ref.parent = decl
 
             if ref.kind == .related {
-                decl.related.insert(ref)
+                decl.related.append(ref)
             } else {
-                decl.references.insert(ref)
+                decl.references.append(ref)
             }
         }
 
@@ -561,7 +553,7 @@ final class SwiftIndexer: Indexer {
 
                 for param in params {
                     let paramDecl = param.makeDeclaration(withParent: functionDecl, interner: self.graph.usrInterner)
-                    functionDecl.unusedParameters.insert(paramDecl)
+                    functionDecl.unusedParameters.append(paramDecl)
                     try graph.add(paramDecl)
 
                     if retainAllDeclarations || (functionDecl.isObjcAccessible && configuration.retainObjcAccessible) {
@@ -643,7 +635,7 @@ final class SwiftIndexer: Indexer {
                             location: decl.location
                         )
                         reference.parent = decl
-                        decl.related.insert(reference)
+                        decl.related.append(reference)
                         references.append(reference)
                     }
                 }

Sources/PeripheryKit/ScanResult.swift

@@ -5,7 +5,7 @@ public struct ScanResult {
     enum Annotation {
         case unused
         case assignOnlyProperty
-        case redundantProtocol(references: Set<Reference>, inherited: Set<String>)
+        case redundantProtocol(references: [Reference], inherited: Set<String>)
         case redundantPublicAccessibility(modules: Set<String>)
         case superfluousIgnoreCommand
     }

Sources/SourceGraph/Elements/Declaration.swift

@@ -306,14 +306,14 @@ public final class Declaration {
     public let name: String
     public let usrs: Set<String>
     public let usrIDs: [USRID]
-    public var unusedParameters: Set<Declaration> = []
-    public var declarations: Set<Declaration> = []
+    public var unusedParameters: [Declaration] = []
+    public var declarations: [Declaration] = []
     public var commentCommands: Set<CommentCommand> = []
-    public var references: Set<Reference> = []
+    public var references: [Reference] = []
     public var declaredType: String?
     public var hasGenericFunctionReturnedMetatypeParameters: Bool = false
     public var parent: Declaration?
-    public var related: Set<Reference> = []
+    public var related: [Reference] = []
     public var isImplicit: Bool = false
     public var isObjcAccessible: Bool = false
     public internal(set) var isUsed: Bool = false
@@ -343,12 +343,12 @@ public final class Declaration {
         }
     }
 
-    public var immediateInheritedTypeReferences: Set<Reference> {
+    public var immediateInheritedTypeReferences: [Reference] {
         let superclassReferences = related.filter { [.class, .struct, .protocol].contains($0.declarationKind) }
 
         // Inherited typealiases are References instead of a Related.
         let typealiasReferences = references.filter { $0.declarationKind == .typealias }
-        return superclassReferences.union(typealiasReferences)
+        return superclassReferences + typealiasReferences
     }
 
     public var isComplexProperty: Bool {

Sources/SourceGraph/Mutators/AncestralReferenceEliminator.swift

@@ -31,7 +31,7 @@ final class AncestralReferenceEliminator: SourceGraphMutator {
         }
     }
 
-    private func eliminateAncestralReferences(in references: Set<Reference>, stack: [USRID]) {
+    private func eliminateAncestralReferences(in references: [Reference], stack: [USRID]) {
         for reference in references {
             if stack.contains(reference.usrID) {
                 graph.remove(reference)

Sources/SourceGraph/Mutators/ExtensionReferenceBuilder.swift

@@ -29,9 +29,9 @@ final class ExtensionReferenceBuilder: SourceGraphMutator {
             // Don't fold protocol extensions as they must be treated differently.
             guard kind != .extensionProtocol else { continue }
 
-            extendedDeclaration.declarations.formUnion(extensionDeclaration.declarations)
-            extendedDeclaration.references.formUnion(extensionDeclaration.references)
-            extendedDeclaration.related.formUnion(extensionDeclaration.related)
+            extendedDeclaration.declarations.append(contentsOf: extensionDeclaration.declarations)
+            extendedDeclaration.references.append(contentsOf: extensionDeclaration.references)
+            extendedDeclaration.related.append(contentsOf: extensionDeclaration.related)
 
             extensionDeclaration.declarations.forEach { $0.parent = extendedDeclaration }
             extensionDeclaration.references.forEach { $0.parent = extendedDeclaration }

Sources/SourceGraph/Mutators/InterfaceBuilderPropertyRetainer.swift

@@ -38,7 +38,7 @@ final class InterfaceBuilderPropertyRetainer {
     ) {
         let inheritedDeclarations = graph.inheritedDeclarations(of: declaration)
         let descendentInheritedDeclarations = inheritedDeclarations.map(\.declarations).joined()
-        let allDeclarations = declaration.declarations.union(descendentInheritedDeclarations)
+        let allDeclarations = declaration.declarations + descendentInheritedDeclarations
 
         for decl in allDeclarations {
             // Check IBOutlet properties

Sources/SourceGraph/Mutators/ProtocolConformanceReferenceBuilder.swift

@@ -160,10 +160,6 @@ final class ProtocolConformanceReferenceBuilder: SourceGraphMutator {
         }
 
         // Apply all mutations after traversal completes.
-        // Reserve capacity to reduce Set resizing during bulk insertions.
-        let estimatedNewRefs = referencesToAdd.count + declarationsToRetain.count
-        graph.ensureReferencesCapacity(graph.allReferences.count - referencesToRemove.count + estimatedNewRefs)
-
         for reference in referencesToRemove {
             graph.remove(reference)
         }

Sources/SourceGraph/Mutators/RedundantProtocolMarker.swift

@@ -59,7 +59,7 @@ final class RedundantProtocolMarker: SourceGraphMutator {
 
             if areAllReferencesConformances {
                 // The protocol is redundant.
-                let inherited = graph.inheritedTypeReferences(of: protocolDecl).filter { $0.declarationKind == .protocol }
+                let inherited = Array(graph.inheritedTypeReferences(of: protocolDecl).filter { $0.declarationKind == .protocol })
                 graph.markRedundantProtocol(protocolDecl, references: protocolReferences, inherited: inherited)
                 protocolDecl.declarations.forEach { graph.markIgnored($0) }
             }

Sources/SourceGraph/Mutators/UnusedImportMarker.swift

@@ -36,9 +36,13 @@ final class UnusedImportMarker: SourceGraphMutator {
     func mutate() throws {
         guard !configuration.disableUnusedImportAnalysis else { return }
 
+        let files = graph.indexedSourceFiles
+
         // Pre-intern all module names (source file modules, import statements,
         // retained modules) so that wordCount is stable for all bitsets.
-        for file in graph.indexedSourceFiles {
+        var fileToIndex = [ObjectIdentifier: Int](minimumCapacity: files.count)
+        for (i, file) in files.enumerated() {
+            fileToIndex[ObjectIdentifier(file)] = i
             for name in file.modules {
                 _ = graph.moduleInterner.intern(name)
             }
@@ -54,12 +58,6 @@ final class UnusedImportMarker: SourceGraphMutator {
         emptyBitset = ModuleBitset(wordCount: wordCount)
         let retainedModuleIDs = graph.moduleInterner.internBitset(retainedModules, wordCount: wordCount)
 
-        let files = graph.indexedSourceFiles
-        var fileToIndex = [ObjectIdentifier: Int](minimumCapacity: files.count)
-        for (i, file) in files.enumerated() {
-            fileToIndex[ObjectIdentifier(file)] = i
-        }
-
         // Manual pointer instead of [UInt64] to eliminate bounds checking and
         // copy-on-write overhead in the inner loops that accumulate module bits.
         let totalWords = files.count * wordCount
@@ -209,26 +207,26 @@ final class UnusedImportMarker: SourceGraphMutator {
         let references: Set<Reference>
 
         if decl.kind.isVariableKind {
-            references = decl.references.filter { $0.role == .varType }
+            references = Set(decl.references.filter { $0.role == .varType })
         } else if decl.kind == .enumelement {
-            references = decl.references
+            references = Set(decl.references)
         } else if decl.kind == .typealias {
             let transitiveReferences = decl.references.flatMapSet { ref -> Set<Reference> in
                 guard let refDecl = graph.declaration(withUsrID: ref.usrID) else { return [] }
 
                 return referencedTypes(from: refDecl)
             }
-            references = decl.references.union(transitiveReferences)
+            references = Set(decl.references).union(transitiveReferences)
         } else if decl.kind.isFunctionKind {
-            references = decl.references
+            references = Set(decl.references
                 .filter {
                     [
                         .returnType,
                         .parameterType,
                     ].contains($0.role)
-                }
+                })
         } else if decl.kind == .protocol {
-            references = decl.related.filter { $0.role == .refinedProtocolType }
+            references = Set(decl.related.filter { $0.role == .refinedProtocolType })
         } else {
             references = []
         }