[Dependency Scannning] Handle special case import of Clang Private "submodules" #66148
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
…ubmodules" There is a special case that already exists in 'ClangImporter' for implicit module loading: Import of a "submodule" named "Foo.Private" is treated as a top-level module named "Foo_Private". Clang has special support for this. Resolves rdar://108287140
|
@swift-ci smoke test |
nkcsgexi
approved these changes
May 25, 2023
xymus
approved these changes
May 25, 2023
xymus
reviewed
May 25, 2023
| @@ -543,7 +543,18 @@ class ModuleDependencyInfo { | |||
| /// Add a dependency on the given module, if it was not already in the set. | |||
| void addModuleImport(ImportPath::Module module, | |||
| llvm::StringSet<> *alreadyAddedModules = nullptr) { | |||
| addModuleImport(module.front().Item.str(), alreadyAddedModules); | |||
| std::string ImportedModuleName = module.front().Item.str().str(); | |||
There was a problem hiding this comment.
Is the .str().str() intentional?
There was a problem hiding this comment.
Sadly, yes. Not enough to have a StringRef now that we may be changing the value of this.
|
@swift-ci smoke test |
tshortli
approved these changes
May 25, 2023
|
@swift-ci 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.
There is a special case that already exists in
ClangImporterfor implicit module loading: Import of a "submodule" namedFoo.Privateis treated as a top-level module namedFoo_Private. Clang has special support for this.Resolves rdar://108287140