[5.5][Explicit Module Builds] Cherry-pick explicit module build changes #781
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
…lization/deserialization swiftlang/swift#37723 added API to libSwiftScan to save and restore the dependency scanner's state on the filesystem. This PR adds this API to the corresponding client code in the driver.
…file names This change ensures that explicit swift module dependencies are built into binary modules with filenames that encode their context hash (as reported by the dependency scanner). e.g. `A.swiftinterface` --> `A-<CONTEXT_HASH>.swiftmodule`. This is required because in some contexts builds of the same module for different contexts (e.g. target architectures) otherwise overlap and cause chaos. Resolves rdar://78820404
…anges. - Pass down SDK paths to explicit module tests - Remove "fake" stdlib files, making sure dependency scanning tests rely on the real ones - Gate a couple of tests on frontend flag availability
This was in-place as a temporary shim while SwiftPM adapted the `InterModuleDependencyOracle` API and a lighter-weight `ExternalTargetModulePathMap`.
…o the scanning action. I got overzealous when deleting code in swiftlang#749 and removed one piece of functionality that we still rely on. Although the external target map is no longer necessary when scanning dependencies using libSwiftScan, we still use it for resolution of `canImport` statements during the scan. We need to figure out a better way to deal with that in the scanner, but in the meantime this will restore functionality.
…dule details Specifically, whether an external target moduel is a framework. This is required to pass this information down to the compiler in order to generate correct auto-linking directives. Part of rdar://81177797
…building Clang explicit dependencies The dependency scanner specifies which exact modulemaps must be used, we do not need Clang to also search for modulemaps.
|
@swift-ci please test |
|
The test failures here are due to dependency on: |
nkcsgexi
approved these changes
Aug 2, 2021
libSwiftDriver clients need to be able to instantiate these objects.
artemcm
added a commit
to artemcm/swift-driver
that referenced
this pull request
Aug 4, 2021
To unblock updating CI Xcode which is currently failing in: https://ci.swift.org/job/swift-PR-macOS-new-xcode/117/console The proper test fix is included in swiftlang#781, which will re-enable this test.
airspeedswift
approved these changes
Aug 10, 2021
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
artemcm
force-pushed
the
ExplicitModuleCherryFarming
branch
from
2ff3ab9 to
d61d9c3
Compare
|
@swift-ci please test |
This was referenced Aug 16, 2021
|
This currently conflicts with where SwiftPM expected libSwiftScan to be located on Linux... |
…ame hash. Not doing so can lead to dangerous collisions if a build system uses a cetral cache across different targets that have a common dependency that is found in different places in the filesystem. For example, when building targets `A` and `B`, both of which depend on Clang module `C`, but have different search paths, finding `C` in two different locations, we should produce two distinct PCMs. With today's hashing scheme, the second will overwrite the first.
artemcm
force-pushed
the
ExplicitModuleCherryFarming
branch
from
d61d9c3 to
5fa09d4
Compare
|
@swift-ci please test |
shahmishal
pushed a commit
that referenced
this pull request
Aug 24, 2021
To unblock updating CI Xcode which is currently failing in: https://ci.swift.org/job/swift-PR-macOS-new-xcode/117/console The proper test fix is included in #781, which will re-enable this test. (cherry picked from commit 4997eb6)
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.
#696: [Explicit Module Builds] Add libSwiftScan API for scanner cache serialization/deserialization
#705: [Explicit Module Builds] Use context hash in Swift dependency module file names
#739: [Explicit Module Builds] Unblock package bots by making tests more resilient to environment changes
#749: [Gardening] Delete deprecated API for tracking external target information
#763: [Dependency Scanning] Restore passing external target map as inputs to the scanning action
#779: [Explicit Module Builds] Add API to specify richer external target module details
#780: [Explicit Module Builds] Pass in -fno-implicit-module-maps for pre-building Clang explicit dependencies
#788: [Explicit Module Builds] Include source modulemap path into PCM filename hash.