Skip to content

Fix integer type mismatches in swift-inspect when building 32-bit. #84735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2025
Merged

Fix integer type mismatches in swift-inspect when building 32-bit. #84735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/swift-inspect/Sources/swift-inspect/DarwinRemoteProcess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ internal final class DarwinRemoteProcess: RemoteProcess {
internal func iteratePotentialMetadataPages(_ body: (swift_addr_t, UInt64) -> Void) {
if let initialPoolPointer: UInt = readGlobalVariable(named: "_swift_debug_allocationPoolPointer"),
let initialPoolSize: UInt = readGlobalVariable(named: "_swift_debug_allocationPoolSize") {
body(swift_reflection_ptr_t(initialPoolPointer), UInt64(initialPoolSize));
body(swift_addr_t(initialPoolPointer), UInt64(initialPoolSize));
}

if let pageSize: UInt = readGlobalVariable(named: "_swift_debug_metadataAllocatorPageSize") {
Expand Down
7 changes: 5 additions & 2 deletions tools/swift-inspect/Sources/swift-inspect/Operations/DumpGenericMetadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,11 @@ internal struct DumpGenericMetadata: ParsableCommand {
private func metadataFromScanning(process: any RemoteProcess) throws -> [Metadata] {
var metadata: [Metadata] = []

func scanMemory(address: swift_reflection_ptr_t, size: UInt64) {
for candidate in stride(from: address, to: address + swift_reflection_ptr_t(size), by: MemoryLayout<UInt>.size) {
func scanMemory(address: swift_addr_t, size: UInt64) {
let convertedAddress = swift_reflection_ptr_t(address)
for candidate in stride(from: convertedAddress,
to: convertedAddress + swift_reflection_ptr_t(size),
by: MemoryLayout<UInt>.size) {
guard let name = process.context.name(type: candidate, mangled: mangled) else {
continue
}
Expand Down