Skip to content

[swift-inspect] Fix the swift-inspect build on Darwin. #41620

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.

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
Mar 2, 2022

Conversation

mikeash
Copy link
Contributor

@mikeash mikeash commented Mar 2, 2022

We had a few typos and such from the recent reorganization.

Same as #41619 except pulling from my fork.

@mikeash mikeash requested review from compnerd and edymtt March 2, 2022 17:10
@mikeash mikeash force-pushed the fix-swift-inspect-darwin branch from 789a3bc to 11351a9 Compare March 2, 2022 17:13
@mikeash
Copy link
Contributor Author

mikeash commented Mar 2, 2022

@swift-ci please smoke test


let module = CSSymbolGetSymbolOwner(symbol)
return (CSSymbolOwnerGetName(module), CSSymbolGetName(symbol))
}
}

extension DarwinRemoteProcess {
internal func iterateHeap(_ body: (swift_addr_t, UInt64) -> Void) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the removal of internal?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, I must have done that as part of some other fix by mistake. Put it back now.

let addr = process.GetSymbolAddress(symbolName)
if let ptr = process.ReadBytes(addr, MemoryLayout<UInt>.size) {
let addr = process.getAddr(symbolName: symbolName)
if let ptr = process.read(address: addr, size: MemoryLayout<UInt>.size) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes will be problematic for Windows support, but we can deal with it then.

We had a few typos and such from the recent reorganization.
@mikeash mikeash force-pushed the fix-swift-inspect-darwin branch from 11351a9 to e29434d Compare March 2, 2022 19:29
@mikeash mikeash changed the title Fix the swift-inspect build on Darwin. [swift-inspect] Fix the swift-inspect build on Darwin. Mar 2, 2022
@mikeash
Copy link
Contributor Author

mikeash commented Mar 2, 2022

@swift-ci please smoke test

@mikeash mikeash merged commit 282b812 into swiftlang:main Mar 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants