[clang][include-tree] Fix spurious dependencies #8266
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
This patch fixes an incorrect assumption that only spurious imports cause both `IncludeTreeBuilder::moduleImport()` and `IncludeTreeBuilder::exitedInclude()` to be called for the same directive. This can also happen for `#include` of a header that belongs to the module being implemented that previously got transitively loaded from a PCM. Instead of trying to guess that a submodule was a spurious import (by checking that it was not imported, is not from module file but its parent is from module file), we just mark it missing from umbrella header when we detect this. This allows us to stop putting the temporary `ModuleImport` onto the stack in one function and later popping and replacing it by `SpuriousImport` in another function. rdar://123253616 Cherry-pick of /pull/8264
|
@swift-ci please test |
benlangmuir
approved these changes
Feb 22, 2024
|
swiftlang/swift#71886 |
(cherry picked from commit 4cf26f5)
|
swiftlang/swift#71886 |
|
@swift-ci please test |
jansvoboda11
deleted the
jan_svoboda/include-tree-spurious-fix-20230725
branch
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.
This patch fixes an incorrect assumption that only spurious imports cause both
IncludeTreeBuilder::moduleImport()andIncludeTreeBuilder::exitedInclude()to be called for the same directive. This can also happen for#includeof a header that belongs to the module being implemented that previously got transitively loaded from a PCM.Instead of trying to guess that a submodule was a spurious import (by checking that it was not imported, is not from module file but its parent is from module file), we just mark it missing from umbrella header when we detect this. This allows us to stop putting the temporary
ModuleImportonto the stack in one function and later popping and replacing it bySpuriousImportin another function.rdar://123253616
Cherry-pick of /pull/8264