[dsymutil] Only set a translation lambda if the translator is valid #987
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
The SymbolMapTranslator defines an operator bool() which checks whether we should translate at all. This returns false if the list of obfuscated strings is empty. The NonRelocatableStringPool (OffsetsStringPool) takes a lambda for translating obfuscated strings rather than a SymbolMapTranslator. However, we were unconditionally passing the SymbolMapTranslator, which got implicitly converted to a std::function because it defines an operator(). In the string pool, we call operator bool but on the lambda, and not on the SymbolMapTranslator. This would always be true, because we were passing the translator unconditionally. This caused spurious warnings about obfuscated strings not being found. This patch fixes the problem by only passing the translation lambda when SymbolMapTranslator::operator bool() is true.
|
rdar://60641222 This issue does not exist upstream, because it was (probably unintentionally) fixed during the big refactor that pulls up the DWARF linking logic so LLD can reuse it. |
|
@swift-ci please test macOS |
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.
The SymbolMapTranslator defines an operator bool() which checks whether
we should translate at all. This returns false if the list of obfuscated
strings is empty.
The NonRelocatableStringPool (OffsetsStringPool) takes a lambda for
translating obfuscated strings rather than a SymbolMapTranslator.
However, we were unconditionally passing the SymbolMapTranslator, which
got implicitly converted to a std::function because it defines an
operator().
In the string pool, we call operator bool but on the lambda, and not on
the SymbolMapTranslator. This would always be true, because we were
passing the translator unconditionally. This caused spurious warnings
about obfuscated strings not being found.
This patch fixes the problem by only passing the translation lambda when
SymbolMapTranslator::operator bool() is true.