Fix the swift-inspect build on Darwin. #41619
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We had a few typos and such from the recent reorganization.
compnerd
approved these changes
Mar 2, 2022
|
|
||
| func getAddr(symbolName: String) -> swift_addr_t { | ||
| // FIXME: use `__USER_LABEL_PREFIX__` instead of the hardcoded `_`. | ||
| let fullName = "_" + symbolName |
There was a problem hiding this comment.
Any reason to not use string interpolation?
| func getAddr(symbolName: String) -> swift_addr_t { | ||
| // FIXME: use `__USER_LABEL_PREFIX__` instead of the hardcoded `_`. | ||
| let fullName = "_" + symbolName | ||
| var symbol = CSSymbolOwnerGetSymbolWithMangledName(swiftCore, fullName) |
There was a problem hiding this comment.
Is there a reason to use var rather than let?
| @@ -76,8 +77,8 @@ fileprivate class ConcurrencyDumper { | |||
| self.process = process | |||
|
|
|||
| func getMetadata(symbolName: String) -> swift_reflection_ptr_t? { | |||
| let addr = process.GetSymbolAddress(symbolName) | |||
| if let ptr = process.ReadBytes(addr, MemoryLayout<UInt>.size) { | |||
| let addr = process.getAddr(symbolName: symbolName) | |||
There was a problem hiding this comment.
I think that this change is less desirable - the GetSymbolAddress is the generic entry that works across all targets.
|
I pushed this branch to the main repo by accident, closing in favor of #41620 from my fork. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We had a few typos and such from the recent reorganization.