[Explicit Module Builds] Restore prior behavior of consuming .h dependencies of binary module dependencies directly, instead of attempting to load their PCH
#69109
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
artemcm
force-pushed
the
EBM_BridgingHeader_Fix
branch
from
632138a to
3e9bfc6
Compare
|
@swift-ci smoke test |
cachemeifyoucan
approved these changes
Oct 10, 2023
| @@ -1297,15 +1299,27 @@ void Serializer::writeInputBlock() { | |||
| off_t importedHeaderSize = 0; | |||
| time_t importedHeaderModTime = 0; | |||
| std::string contents; | |||
| if (!Options.ImportedHeader.empty()) { | |||
| auto importedHeaderPath = Options.ImportedHeader; | |||
| // We do not want to serialize the explicitly-specified .pch path if one was | |||
There was a problem hiding this comment.
Do we have test coverage for this? That is what happens when -disable-bridging-pch is used?
There was a problem hiding this comment.
header_deps_of_binary.swift is testing this very thing. A binary module is being built with a direct .pch file and what is serialized in it is a .h of the source.
-disable-bridging-pch is a driver flag to always feed the .h directly to the TU compilation, instead of ever creating a PCH.
artemcm
force-pushed
the
EBM_BridgingHeader_Fix
branch
from
3e9bfc6 to
48e5d4d
Compare
|
@swift-ci test |
Hmm. |
artemcm
force-pushed
the
EBM_BridgingHeader_Fix
branch
from
48e5d4d to
9fa8f5a
Compare
|
@swift-ci test and merge |
…idging header is provided In explicit module builds, bridging header is passed directly as a '.pch' input. Loading clients may not be able to directly import this PCH because it was built against mis-matched dependencies with a different context hash. So instead they should directly injest the '.h' depndency and build it against their own set of dependencies.
artemcm
force-pushed
the
EBM_BridgingHeader_Fix
branch
from
9fa8f5a to
d2ad931
Compare
|
@swift-ci smoke test and merge |
artemcm
added a commit
to swiftlang/swift-driver
that referenced
this pull request
Oct 12, 2023
…ng dependency PCH As of swiftlang/swift#69109 we no longer propagate the PCH to dependencies in non-cached builds. For cached builds, this functionality is tested in 'testCacheBuildEndToEndWithBinaryHeaderDeps'.
artemcm
added a commit
to swiftlang/swift-driver
that referenced
this pull request
Oct 12, 2023
…ng dependency PCH As of swiftlang/swift#69109 we no longer propagate the PCH to dependencies in non-cached builds. For cached builds, this functionality is tested in 'testCacheBuildEndToEndWithBinaryHeaderDeps'.
…f binary modules unless in CAS mode We only record these dependencies in CAS mode, because we require explicit PCH tasks to be produced for imported header of binary module dependencies. In the meantime, in non-CAS mode loading clients will consume the `.h` files encoded in the `.swiftmodules` directly. Followup changes to SwiftDriver will enable explicit PCH compilation of such dependenceis, but for the time being restore prior behavior for non-CAS explicit module builds. Resolves rdar://116006619
artemcm
force-pushed
the
EBM_BridgingHeader_Fix
branch
from
d2ad931 to
75ee48c
Compare
artemcm
added a commit
to swiftlang/swift-driver
that referenced
this pull request
Oct 12, 2023
…ng dependency PCH As of swiftlang/swift#69109 we no longer propagate the PCH to dependencies in non-cached builds. For cached builds, this functionality is tested in 'testCacheBuildEndToEndWithBinaryHeaderDeps'.
artemcm
added a commit
to swiftlang/swift-driver
that referenced
this pull request
Oct 13, 2023
…ng dependency PCH As of swiftlang/swift#69109 we no longer propagate the PCH to dependencies in non-cached builds. For cached builds, this functionality is tested in 'testCacheBuildEndToEndWithBinaryHeaderDeps'.
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.
.hpath when an explicit.pchbridging header is provided. In explicit module builds, bridging header is passed directly as a.pchinput. Loading clients may not be able to directly import this PCH because it was built against mis-matched dependencies with a different context hash. So instead they should directly ingest the.hdependency and build it against their own set of dependencies..hfiles encoded in the.swiftmodulesdirectly. Followup changes to SwiftDriver will enable explicit PCH compilation of such dependencies, but for the time being restore prior behavior for non-CAS explicit module builds.Resolves rdar://116006619