Account for multiple modules when looking up the DeclContext of a type #76065
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
augusto2112
requested review from
rjmccall,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci test |
|
@swift-ci smoke test |
slavapestov
reviewed
Aug 23, 2024
augusto2112
force-pushed
the
clash-abi-name-demangler
branch
from
7583e25 to
799bab0
Compare
|
@swift-ci test |
|
@swift-ci smoke test |
augusto2112
force-pushed
the
clash-abi-name-demangler
branch
from
799bab0 to
862a6ac
Compare
|
@swift-ci smoke test |
|
@swift-ci test |
augusto2112
force-pushed
the
clash-abi-name-demangler
branch
from
862a6ac to
31a4839
Compare
|
@swift-ci test |
|
@swift-ci smoke test |
|
@slavapestov ping :) |
| if (!decl) return nullptr; | ||
| for (auto *module : *potentialModules) | ||
| if (auto *decl = module->lookupLocalType(mangledName)) | ||
| return dyn_cast<DeclContext>(decl); |
There was a problem hiding this comment.
Could this be a findModuleContaining(mangledName) helper function that is reused?
There was a problem hiding this comment.
I could put this in a helper but besides iterating over the modules there's nothing in common I could reuse between callers of findPotentialModules.
When looking up the decl context of a type, ASTDemangler has to take into account that there are multiple different modules where that type could've come from. This is due to two facts: - Thanks to the `-module-abi-name` flag, multiple modules can share the same ABI name (which is the module name that is usually used when mangling a type). - In some situations mangling can use the module's real name, for example, when mangling for the debugger or USRs coupled with @_originallyDefinedIn. rdar://134095412
augusto2112
force-pushed
the
clash-abi-name-demangler
branch
from
31a4839 to
141c96f
Compare
|
@swift-ci test |
|
@swift-ci smoke test |
adrian-prantl
approved these changes
Sep 5, 2024
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.
When looking up the decl context of a type, ASTDemangler has to take into account that there are multiple different modules where that type could've come from. This is due to two facts:
-module-abi-nameflag, multiple modules can share the same ABI name (which is the module name that is usually used when mangling a type).rdar://134095412