[clang][modules][deps] Cherry-pick explicit modules commits #5568
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 is a fix related to D135414. The original intention was to keep `BaseFS` as a member of the worker and conditionally overlay it with local in-memory FS. The `move` of ref-counted `BaseFS` was not intended, and it's a bug. Disabling parallelism in the "by-module-name" test reliably reproduces this, and the test itself doesn't *need* parallelism. (I think `-j 4` was cargo culted from another test.) Reusing that test to check for correct behavior... Reviewed By: DavidSpickett Differential Revision: https://reviews.llvm.org/D136124 (cherry picked from commit d239f3c)
(cherry picked from commit 6dda497)
This patch adds new functions for writing/reading `FileID`s and uses them to replace some ad-hoc code. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D137211 (cherry picked from commit fdbc55a)
…instead of SourceLocation For pragma diagnostic mappings, we always write/read `SourceLocation` with offset 0. This is equivalent to just writing a `FileID`, which is exactly what this patch starts doing. Depends on D137211. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D137213 (cherry picked from commit f61c135)
…ceManager offsets This patch is a NFC prep for D136624, where we start adjusting offsets into `SourceManager`. Depends on D137213. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D137214 (cherry picked from commit 0bfc97e)
This is a prep-patch for D136624 which allows querying `SourceManager` with raw offsets instead of `SourceLocation`s. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D137215 (cherry picked from commit 9ae6e6a)
…affecting files This patch delays some `ASTWriter` logic until after we've checked whether the source location entry we're serializing as an affecting file or not. Depends on D137214. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D137216 (cherry picked from commit a13122c)
In D106876, we stopped serializing module map files that didn't affect compilation of the current module. However, since each `SourceLocation` is simply an offset into `SourceManager`'s global buffer of concatenated input files in, these need to be adjusted during serialization. Otherwise, they can incorrectly point after the buffer or into subsequent input file. This patch starts adjusting `SourceLocation`s, `FileID`s and other `SourceManager` offsets in `ASTWriter`. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D136624 (cherry picked from commit 6924a49)
The dependency scanner relies on the module map filtering logic in `ASTWriter`. The algorithm currently considers all system module maps affecting, which is not only sub-optimal, but can also cause failures when building a module explicitly (see attached test case). This patch applies the same filtering logic to system module maps. Reviewed By: Bigcheese Differential Revision: https://reviews.llvm.org/D136007 (cherry picked from commit f33173a)
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
|
Any chance we can also include 060b253? |
|
That commit already is in the target branch: 35515c9. |
Ah. I was looking it up by hash. Thank you! |
|
I believe some Swift fixes came in recently that might unblock this |
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 PR cherry-picks upstream commits motivated by implicitly discovered, explicitly built Clang modules.