Merge pull request #145 from p-x9/feature/symbols-random-access-colle…

…ction Fix to use `RandomAccessCollection` of symbols
p-x9 · Nov 18, 2024 · 94fe4fa · 94fe4fa
2 parents b4b5132 + 911695f
commit 94fe4fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Sources/MachOKit/Protocol/MachORepresentable.swift b/Sources/MachOKit/Protocol/MachORepresentable.swift
@@ -376,7 +376,7 @@ extension MachORepresentable {
         inSection sectionNumber: Int = 0,
         isGlobalOnly: Bool = false
     ) -> [Symbol] {
-        let symbols = Array(self.symbols)
+        let symbols = self.symbols
         var bestOffset: Int?
         var bestSymbols: [Symbol] = []
 
@@ -401,7 +401,7 @@ extension MachORepresentable {
             let globalStart: Int = numericCast(dysym.iextdefsym)
             let globalCount: Int = numericCast(dysym.nextdefsym)
             for i in globalStart ..< globalStart + globalCount {
-                let symbol = symbols[i]
+                let symbol = symbols[AnyIndex(i)]
                 let nlist = symbol.nlist
                 let symbolSectionNumber = symbol.nlist.sectionNumber
 
@@ -418,7 +418,7 @@ extension MachORepresentable {
             let localStart: Int = numericCast(dysym.ilocalsym)
             let localCount: Int = numericCast(dysym.nlocalsym)
             for i in localStart ..< localStart + localCount {
-                let symbol = symbols[i]
+                let symbol = symbols[AnyIndex(i)]
                 let nlist = symbol.nlist
                 let symbolSectionNumber = symbol.nlist.sectionNumber
 
@@ -552,15 +552,15 @@ extension MachORepresentable {
             return nil
         }
 
-        let symbols = Array(self.symbols)
+        let symbols = self.symbols
         var bestSymbol: Symbol?
 
         if let dysym = loadCommands.dysymtab {
             // find closest match in globals
             let globalStart: Int = numericCast(dysym.iextdefsym)
             let globalCount: Int = numericCast(dysym.nextdefsym)
             for i in globalStart ..< globalStart + globalCount {
-                let symbol = symbols[i]
+                let symbol = symbols[AnyIndex(i)]
                 let nlist = symbol.nlist
                 guard nlist.flags?.type == .sect,
                       matchesName(nameC, symbol) else {
@@ -574,7 +574,7 @@ extension MachORepresentable {
             let localStart: Int = numericCast(dysym.ilocalsym)
             let localCount: Int = numericCast(dysym.nlocalsym)
             for i in localStart ..< localStart + localCount {
-                let symbol = symbols[i]
+                let symbol = symbols[AnyIndex(i)]
                 let nlist = symbol.nlist
                 guard nlist.flags?.type == .sect,
                       nlist.flags?.stab == nil,

diff --git a/Tests/MachOKitTests/MachOFilePrintTests.swift b/Tests/MachOKitTests/MachOFilePrintTests.swift
@@ -99,7 +99,7 @@ final class MachOFilePrintTests: XCTestCase {
     }
 
     func testSectionRelocationInfos() {
-        let symbols = Array(machO.symbols)
+        let symbols = machO.symbols
         for section in machO.sections32 where section.nreloc > 0 {
             print("----")
             print("Name:", "\(section.segmentName).\(section.sectionName)"
@@ -118,7 +118,7 @@ final class MachOFilePrintTests: XCTestCase {
                     print("pcRelative:", info.isRelocatedPCRelative)
                     if let symbolIndex = info.symbolIndex {
                         print("SymbolIndex:", symbolIndex)
-                        print("SymbolName:", symbols[symbolIndex].name)
+                        print("SymbolName:", symbols[AnyIndex(symbolIndex)].name)
                     }
                     if let sectionOrdinal = info.sectionOrdinal {
                         print("SectionOrdinal:", sectionOrdinal)
@@ -239,7 +239,7 @@ final class MachOFilePrintTests: XCTestCase {
 
     func testIndirectSymbols() throws {
         guard let _indirectSymbols = machO.indirectSymbols else { return }
-        let symbols = Array(machO.symbols)
+        let symbols = machO.symbols
         let indirectSymbols = Array(_indirectSymbols)
 
         for section in machO.sections {
@@ -253,7 +253,7 @@ final class MachOFilePrintTests: XCTestCase {
             for symbol in indirectSymbols {
                 print(" ", symbol._value, terminator: " ")
                 if let index = symbol.index {
-                    print(symbols[index].name)
+                    print(symbols[AnyIndex(index)].name)
                 } else {
                     print(symbol)
                 }

diff --git a/Tests/MachOKitTests/MachOPrintTests.swift b/Tests/MachOKitTests/MachOPrintTests.swift
@@ -170,7 +170,7 @@ final class MachOPrintTests: XCTestCase {
 
     func testIndirectSymbols() throws {
         guard let _indirectSymbols = machO.indirectSymbols else { return }
-        let symbols = Array(machO.symbols)
+        let symbols = machO.symbols
         let indirectSymbols = Array(_indirectSymbols)
 
         for section in machO.sections {
@@ -184,7 +184,7 @@ final class MachOPrintTests: XCTestCase {
             for symbol in indirectSymbols {
                 print(" ", symbol._value, terminator: " ")
                 if let index = symbol.index {
-                    print(symbols[index].name)
+                    print(symbols[AnyIndex(index)].name)
                 } else {
                     print(symbol)
                 }