[DoNotMerge][6.2][IncludeTree] IncludeTreeFileList optimizations #10674
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
cachemeifyoucan
commented
May 13, 2025
cachemeifyoucan
commented
- Explanation: Optimize IncludeTreeFileList to make creation and iterating to have less overhead and easier to use.
- Scope: Needed for swift change: [DoNotMerge][6.2][Caching] Reduce the number of cas ID passed on frontend commandline swift#81493
- Issues: rdar://148752988
- Original PRs: [IncludeTree] IncludeTreeFileList optimizations #10535
- Risk: Low
- Testing: Already covered by existing unit tests and swift unit tests.
- Reviewers: @benlangmuir
Optimize IncludeTreeFileList to make creation and iterating to have less overhead and easier to use: * Unify the conflict file detection code with the code that uniquing the file from nested FileList so there is no need to use separate data structures. * Extend the conflict file content detection to iterating method `forEachFile` so it is easier to discover the problem with no overhead since no extra data structure is needed. * Improve the IncludeTreeFileSystem constructor to share more functions between two versions. * Remove an unnecessary requirement that IncludeTree::FileList must contain FileEntries. It can have an empty file entries list but provides nesting FileList accesses. (cherry picked from commit 74b92b0)
|
@swift-ci please test |
akyrtzi
approved these changes
May 13, 2025
|
@cachemeifyoucan FWIW the release branch gets automerged into the stable branch, so you can just land stuff on the release branch whenever you want it to be picked up by the swift-main-aligned LLVM branch. |
|
That is not optimal when llvm change as corresponding swift changes and to nominate swift change, it needs to land in main, thus llvm change needs to go to stable branch first. |
|
Ah, this is a cross-repo change. Fair enough! |
cachemeifyoucan
changed the title
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.