Swift: rework resource dir #14629
Merged
Swift: rework resource dir #14629
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
…olchain This fetches the resource directory directly from the released toolchains, allowing us to stop prebuilding and assembling them. Moreover insertion of our resource directory is moved to the lua tracing configuration (solving a `TODO`) and enhanced. Now all options that start with the original resource directory (either explicit or implied) are redirected to our resource directory. This solves a problem where `-I <original resource dir>/some/path` was passed to the extractor and did not work. This works around the 5.9 linux compatibility problem by including the `PackageDescription` swift modules in the in-dist toolchain. Copying the toolchain and fixing the `-I` flag was not enough as for some reason compilation of `PackageDescription.swiftinterface` was causing a crash in the SIL pass. We work around that by pre-compiling those modules during the build and including `.swiftmodule` files in the resource directory. TODO (apart from testing): * the libraries included in the macOS toolchain are now fat (they were intel only before), occupying more space. We should see if we need to trim them down. * there might be other swiftinterface files causing problems on linux lurking around... * if we go with this, we can simplify and trim down the prebuilding we do leaving out the resource directory.
redsun82
force-pushed
the
redsun82/rework-resource-dir
branch
from
d85bad4 to
567aa11
Compare
AlexDenisov
approved these changes
Nov 2, 2023
There was a problem hiding this comment.
Both QA and DCA runs look good 
the libraries included in the macOS toolchain are now fat (they were
intel only before), occupying more space. We should see if we need to
trim them down.
I don't think we should thin anything. The main size contributions at this point are just new dylibs, it seems we won't win much by thinning what's in there.
there might be other swiftinterface files causing problems on linux
lurking around...
Let's keep an eye on it!
if we go with this, we can simplify and trim down the prebuilding we
do leaving out the resource directory.
Let's keep that part in place for a moment, it might still be useful for local debugging.
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 fetches the resource directory directly from the released
toolchains, allowing us to stop prebuilding and assembling them.
Moreover insertion of our resource directory is moved to the lua
tracing configuration (solving a
TODO) and enhanced. Now all optionsthat start with the original resource directory (either explicit or
implied) are redirected to our resource directory.
This solves a problem where
-I <original resource dir>/some/pathwaspassed to the extractor and did not work.
This works around the 5.9 linux compatibility problem by including the
PackageDescriptionswift modules in the in-dist toolchain. Copying thetoolchain and fixing the
-Iflag was not enough as for some reasoncompilation of
PackageDescription.swiftinterfacewas causing a crashin the SIL pass. We work around that by pre-compiling those modules
during the build and including
.swiftmodulefiles in the resourcedirectory.
TODO (apart from testing):
intel only before), occupying more space. We should see if we need to
trim them down.
lurking around...
do leaving out the resource directory.