[ClangImporter] Avoid calling into ObjCSelector lookup #31937
Merged
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 ClangImporter currently calls into `ObjCSelector`'s `lookupDirect` in a couple of places, stashing the selector in a DenseMap to try and avoid re-entrancy problems. However this will become a problem once `ObjCSelector`'s `lookupDirect` is both requestified and starts pulling in members from the main module, so migrate the ClangImporter off calling it. Fortunately most of its uses only care about decls with associated Clang nodes. For those cases, we can use the existing member table, making sure to populate it with any method we import. In one case, the ClangImporter needs to check to see if there's a deserialized Swift method with a matching selector. Instead of calling through to `lookupDirect`, let's just query the Swift module loaders directly.
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
CodaFi
approved these changes
May 22, 2020
|
@swift-ci please smoke test |
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 ClangImporter currently calls into
ObjCSelector'slookupDirectin a couple of places, stashing the selector in a DenseMap to try and avoid re-entrancy problems.However this will become a problem once
ObjCSelector'slookupDirectis both requestified and starts pulling in members from the main module, so migrate the ClangImporter off calling it.Fortunately most of its uses only care about decls with associated Clang nodes. For those cases, we can use the existing member table, making sure to populate it with any method we import.
In one case, the ClangImporter needs to check to see if there's a deserialized Swift method with a matching selector. Instead of calling through to
lookupDirect, let's just query the Swift module loaders directly.