[ClangImporter] Consolidate clang invocation creation #70456
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
cachemeifyoucan
requested review from
artemcm,
zoecarver,
hyp,
egorzhdan,
tshortli,
hborla,
slavapestov and
xedin
as code owners
cachemeifyoucan
force-pushed
the
eng/PR-119577349
branch
from
6b8647b to
5fce646
Compare
|
@swift-ci please smoke test |
cachemeifyoucan
force-pushed
the
eng/PR-119577349
branch
from
5fce646 to
e9e7577
Compare
|
@swift-ci please smoke test |
cachemeifyoucan
force-pushed
the
eng/PR-119577349
branch
from
e9e7577 to
65121d2
Compare
|
@swift-ci please smoke test |
cachemeifyoucan
force-pushed
the
eng/PR-119577349
branch
from
65121d2 to
28ca611
Compare
|
@swift-ci please smoke test |
|
ping |
|
@swift-ci Please Test Source Compatibility |
|
@swift-ci Test |
artemcm
approved these changes
Dec 19, 2023
Re-write and clean up how clang-importer is created from clang arguments. Previously, it is unclear if `getClangArguments` will return CC1 args or driver args and the logic is unnecessarily compilicated when creating clang invocation. Now clang invocation is always created from cc1 arguments, which can be directly provided via direct-cc1-mode or converted from driver args. There is no functional changes in this patch, other than `-dump-clang-diagnostics` now will always print cc1 args, and also driver args if that is applicable.
Currently, `-direct-clang-cc1-module-build` and `-only-use-extra-clang-opts` have to be passed together for clang importer creation to succeed. Missing either will result in error. Simplified the swift-frontend flags by removing `-only-use-extra-clang-opts` and let `-direct-clang-cc1-module-build` to do both.
When caching + clang include tree is enabled, don't take module map file from command-line in clang importer. Those are resulted from `-Xcc` arguments and do not needed in compilation since module maps are included in include-tree. rdar://119577349
cachemeifyoucan
force-pushed
the
eng/PR-119577349
branch
from
28ca611 to
9be16a1
Compare
|
Rebase to resolve merge conflict. @ian-twilightcoder this should fix your test failures that you try to XFAIL. |
|
@swift-ci please smoke test |
Woohoo! Does it also fix test/ModuleInterface/no-implicit-extra-clang-opts.swift in Windows? |
ian-twilightcoder
approved these changes
Dec 19, 2023
| getClangArguments(ASTContext &ctx, bool ignoreClangTarget = false); | ||
| getClangDriverArguments(ASTContext &ctx, bool ignoreClangTarget = false); | ||
|
|
||
| static std::optional<std::vector<std::string>> |
There was a problem hiding this comment.
Why static with an importer arg instead of making it an instance method?
There was a problem hiding this comment.
This is called from static create function.
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.
Update how clang-importer is created from clang arguments by always using cc1 option. This allows simplified logics and unified code whether direct-cc1-module-build is used or not. This also allow implementing a workaround for one of the caching build issue.