[5.4][ClangImporter] Load the stdlib even if there is a -fmodule-map-file argument pointing to a missing file
#37481
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 nominate |
nkcsgexi
approved these changes
May 18, 2021
akyrtzi
approved these changes
May 18, 2021
ahoppen
force-pushed
the
pr-5.4/rdar-78035990
branch
from
92c823a to
faa92ea
Compare
…` argument pointing to a missing file If there is a `-fmodule-map-file` argument whose file doesn’t exist and SwiftShims is not in the module cache, we fail to build it, because clang throws an error about the missing module map. This causes SourceKit to drop all semantic functionality, even if the missing module map isn’t required. To work around this, drop all `-fmodule-map-file` arguments with missing files from the clang importer’s arguments, reporting the eror that `clang` would throw manually. Fixes rdar://77449671
ahoppen
force-pushed
the
pr-5.4/rdar-78035990
branch
from
faa92ea to
631ff40
Compare
|
@swift-ci Please test |
|
Compared to the original PR I’m cherry-picking, I needed to change the call to - importer->Impl.diagnose(SourceLoc(), diag::module_map_not_found,
- ModuleMapFile);
+ importer->Impl.SwiftContext.Diags.diagnose(
+ SourceLoc(), diag::module_map_not_found, ModuleMapFile);The change uses a simplified version of the |
AnthonyLatsis
added
swift 5.4
🍒 release cherry pick
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.
Cherry-picks #37252 to
release/5.4.If there is a
-fmodule-map-fileargument whose file doesn’t exist and SwiftShims is not in the module cache, we fail to build it, because clang throws an error about the missing module map. This causes SourceKit to drop all semantic functionality, even if the missing module map isn’t required.To work around this, drop all
-fmodule-map-filearguments with missing files from the clang importer’s arguments, reporting the error thatclangwould throw manually.