Merge pull request #41268 from mikeash/fix-swift-inspect-32-bit

[swift-inspect] Fix errors when targeting 32-bit.

Author: mikeash

tools/swift-inspect/Sources/swift-inspect/Backtrace.swift

@@ -26,7 +26,7 @@ struct Backtrace {
     ptr: swift_reflection_ptr_t,
     inspector: Inspector
   ) -> String {
-    let symbol = inspector.getSymbol(address: ptr)
+    let symbol = inspector.getSymbol(address: swift_addr_t(ptr))
     let name = symbol.name ?? "<unknown>"
     let library = symbol.library ?? "<unknown>"
     return "\(hex: ptr) (\(library)) \(name)"

tools/swift-inspect/Sources/swift-inspect/DumpConcurrency.swift

@@ -70,11 +70,11 @@ fileprivate class ConcurrencyDumper {
     inspector.enumerateMallocs { (pointer, size) in
       let metadata = swift_reflection_ptr_t(swift_reflection_metadataForObject(context, UInt(pointer)))
       if metadata == jobMetadata {
-        result.jobs.append(pointer)
+        result.jobs.append(swift_reflection_ptr_t(pointer))
       } else if metadata == taskMetadata {
-        result.tasks.append(pointer)
+        result.tasks.append(swift_reflection_ptr_t(pointer))
       } else if isActorMetadata(metadata) {
-        result.actors.append(pointer)
+        result.actors.append(swift_reflection_ptr_t(pointer))
       }
     }
 
@@ -85,7 +85,7 @@ fileprivate class ConcurrencyDumper {
     var map: [swift_reflection_ptr_t: TaskInfo] = [:]
     var tasksToScan: Set<swift_reflection_ptr_t> = []
     tasksToScan.formUnion(heapInfo.tasks)
-    tasksToScan.formUnion(threadCurrentTasks.map{ $0.currentTask }.filter{ $0 != 0 })
+    tasksToScan.formUnion(threadCurrentTasks.map{ swift_reflection_ptr_t($0.currentTask) }.filter{ $0 != 0 })
 
     while !tasksToScan.isEmpty {
       let taskToScan = tasksToScan.removeFirst()
@@ -205,7 +205,7 @@ fileprivate class ConcurrencyDumper {
   }
 
   func symbolicateBacktracePointer(ptr: swift_reflection_ptr_t) -> String {
-    guard let name = inspector.getSymbol(address: ptr).name else {
+    guard let name = inspector.getSymbol(address: swift_addr_t(ptr)).name else {
       return "<\(hex: ptr)>"
     }
 
@@ -286,10 +286,8 @@ fileprivate class ConcurrencyDumper {
       lastChilds.removeSubrange(level...)
       lastChilds.append(lastChild)
 
-      let nextEntry = i < hierarchy.count - 1 ? hierarchy[i + 1] : nil
       let prevEntry = i > 0 ? hierarchy[i - 1] : nil
 
-      let levelWillDecrease = level > (nextEntry?.level ?? -1)
       let levelDidIncrease = level > (prevEntry?.level ?? -1)
 
       var prefix = ""
@@ -311,7 +309,7 @@ fileprivate class ConcurrencyDumper {
         firstLine = false
       }
 
-      let runJobSymbol = inspector.getSymbol(address: task.runJob)
+      let runJobSymbol = inspector.getSymbol(address: swift_addr_t(task.runJob))
       let runJobLibrary = runJobSymbol.library ?? "<unknown>"
 
       let symbolicatedBacktrace = task.asyncBacktrace.map(symbolicateBacktracePointer)
@@ -390,7 +388,7 @@ fileprivate class ConcurrencyDumper {
 
     for (thread, task) in threadCurrentTasks {
       let taskStr: String
-      if let info = tasks[task] {
+      if let info = tasks[swift_reflection_ptr_t(task)] {
         taskStr = "\(hex: info.id)"
       } else {
         taskStr = "<unknown task \(hex: task)>"

tools/swift-inspect/Sources/swift-inspect/Inspector.swift

@@ -52,6 +52,12 @@ class Inspector {
       return 0
     }
 
+#if os(tvOS) || os(watchOS)
+    if tryForkCorpse {
+      print("warning: unable to generate corpse on this OS")
+    }
+    return task
+#else
     if !tryForkCorpse {
       return task
     }
@@ -66,6 +72,7 @@ class Inspector {
       print("warning: unable to generate corpse for pid \(pid): \(machErrStr(kr))", to: &Std.err)
       return task
     }
+#endif
   }
 
   func passContext() -> UnsafeMutableRawPointer {
@@ -129,7 +136,7 @@ class Inspector {
       }
 
       // Deallocate the thread list.
-      let ptr = vm_address_t(bitPattern: threadList)
+      let ptr = vm_address_t(truncatingIfNeeded: Int(bitPattern: threadList))
       let size = vm_size_t(MemoryLayout<thread_t>.size) * vm_size_t(threadCount)
       vm_deallocate(mach_task_self_, ptr, size);
     }

tools/swift-inspect/Sources/swift-inspect/RemoteMirrorExtensions.swift

@@ -62,7 +62,7 @@ extension SwiftReflectionContextRef {
     reader: (swift_addr_t, Int) -> UnsafeRawPointer?
   ) -> UInt? {
     let size = MemoryLayout<UInt>.stride * 3
-    guard let ptr = reader(array, size) else { return nil }
+    guard let ptr = reader(swift_addr_t(array), size) else { return nil }
     let typedPtr = ptr.bindMemory(to: UInt.self, capacity: 3)
     // Array layout goes: metadata, refcount, count
     return typedPtr[2]

tools/swift-inspect/Sources/swift-inspect/main.swift

@@ -100,9 +100,9 @@ func dumpArrays(
     guard metadata != 0 else { return }
     guard context.isAContiguousArray(metadata: metadata) else { return }
     let isClass = context.isAContiguousArrayOfClassElementType(metadata: metadata)
-    let count = context.arrayCount(array: pointer, reader: inspector.read)
+    let count = context.arrayCount(array: swift_reflection_ptr_t(pointer), reader: inspector.read)
     let countStr = count.map({ String($0) }) ?? "<unknown>"
-    print("\(hex: pointer)\t\(size)\t\(countStr)\t\(isClass)")
+    print("\(hex: swift_reflection_ptr_t(pointer))\t\(size)\t\(countStr)\t\(isClass)")
   })
 }