[clang][deps] Cherry-pick recent changes #5234
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
|
@swift-ci please test |
benlangmuir
approved these changes
Aug 30, 2022
jansvoboda11
force-pushed
the
jan_svoboda/cherry-pick
branch
from
29d4b41 to
6382030
Compare
|
@swift-ci please test |
|
swiftlang/swift#60882 |
4 similar comments
|
swiftlang/swift#60882 |
|
swiftlang/swift#60882 |
|
swiftlang/swift#60882 |
|
swiftlang/swift#60882 |
|
swiftlang/swift#60882 |
|
New failures look like a real issue: |
|
We thought we addressed these with swiftlang/swift#61025. |
|
swiftlang/swift#60882 |
1 similar comment
|
swiftlang/swift#60882 |
Since D129389 (and downstream PR #4965), the dependency scanner is responsible for generating full command-lines, including the modules paths. This patch removes the flag that was making this an opt-in behavior in clang-scan-deps. Reviewed By: benlangmuir Differential Revision: https://reviews.llvm.org/D131420
Reduce unnecessary differences with upstream dep scanning code, and group some of the changes so they are in larger regions that are easier to follow. (cherry picked from commit c42e2d8)
Instead of delaying the generation of command-lines to after all dependencies are reported, compute them immediately. This is partly in preparation for splitting the TU driver command into its constituent cc1 and other jobs, but it also just simplifies working with the compiler invocation for modules if they are not "without paths". Also change the computation of the default output path in clang-scan-deps to scrape the implicit module cache from the command-line rather than get it from the dependency, since that is now unavailable at the time we make the callback. Differential Revision: https://reviews.llvm.org/D131934
This patch introduces new option `-eager-load-pcm` to `clang-scan-deps`, which controls whether the resulting command-lines will load PCM files eagerly (at the start of compilation) or lazily (when handling import directive). This patch also switches the default from eager to lazy. To reduce the potential for churn in LIT tests in the future, this patch also removes redundant checks of command-line arguments and introduces new test `modules-dep-args.c` as a substitute. Reviewed By: benlangmuir Differential Revision: https://reviews.llvm.org/D132066
Move copying compiler arguments to a vector<string> and modifying common module-related options into CompilerInvocation in preparation for using some of them in more places and to avoid duplicating this code accidentally in the future. Differential Revision: https://reviews.llvm.org/D132419
When compiling a module, its semantics and Clang's behavior are affected by other modules. These modules are typically the **imported** ones. However, during implicit build, some modules end up being compiled and read without being actually imported. This patch starts tracking such modules and serializing them into `.pcm` files. This enables the dependency scanner to construct explicit compilations that mimic implicit build. Reviewed By: benlangmuir Differential Revision: https://reviews.llvm.org/D132430
…ivate When Clang encounters `@import M.Private` during implicit build, it precompiles module `M` and looks through its submodules. If the `Private` submodule is not found, Clang assumes `@import M_Private`. In the dependency scanner, we don't capture the dependency on `M`, since it's not imported. It's an affecting module, though: compilation of the import statement will fail when implicit modules are disabled and `M` is not precompiled and explicitly provided. This patch fixes that. Depends on D132430. Reviewed By: benlangmuir Differential Revision: https://reviews.llvm.org/D132502
The invocation is only ever used to serialize cc1 arguments from, so instead serialize the arguments inside the dep scanner to simplify the interface. Differential Revision: https://reviews.llvm.org/D132616
* Factor module map and module file path functions out * Use a secondary mapping to lookup module deps by ID instead of the preprocessor module map. * Sink DirectPrebuiltModularDeps into MDC. Differential Revision: https://reviews.llvm.org/D132617
We can now use a DenseMap instead. rdar://99151069
Fix missing include; the header was not actually standalone due to a an incomplete type used in IntrusiveRefCntPtr. (cherry picked from commit 4fd7b98)
jansvoboda11
force-pushed
the
jan_svoboda/cherry-pick
branch
from
6045d7b to
b1c74a0
Compare
|
swiftlang/swift#60882 |
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 cherry-picks some upstream changes to the dependency scanner.