[ParseableInterface] Pass prebuilt cache path down to sub-invocations #21513
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
When trying to load a swiftinterface, search this directory before doing all the work of building a swiftmodule.
Makes this code easier to read. No functionality change.
The previous 'openModuleFiles' interface in SerializedModuleLoaderBase still assumed that swiftmodule files and swiftdoc files would be found next to each other, but that's not true anymore with swiftinterfaces-built-to-modules. Give up on this assumption (and on the minor optimization of passing down a scratch buffer) and split out the interface into the customization point 'findModuleFilesInDirectory' and the implementation 'openModuleFiles'. The latter now takes two full paths: one for the swiftmodule, one for the swiftdoc.
This is a little trickier than it sounds because we have 'friend' access into the FrontendInputsAndOutputs structure, which means all the helpers need to be declared in the header file. But it makes the two use sites simpler, and does slightly less work in the cache hit path.
Otherwise, the top-level compilation gets the benefit of the prebuilt cache path, but the sub-invocations for swiftinterfaces that /do/ need to be compiled do not.
If the frontend is invoked with -build-module-from-parseable-interface, we might be trying to persist and distribute the swiftmodule that gets built. In that case, any dependencies we list might not be relevant. This probably isn't really the final answer here; what we want is some way to say /which/ dependencies are relevant, and how they're related to how the swiftmodule that gets used. Most likely the right answer here is to limit this to dependencies within the SDK or something.
|
@swift-ci Please test |
|
Review ping |
nathawes
approved these changes
Jan 9, 2019
This was referenced Jan 9, 2019
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.
Otherwise, the top-level compilation gets the benefit of the prebuilt cache path, but the sub-invocations for swiftinterfaces that do need to be compiled do not.
Also, don't serialize deps for explicit builds. If the frontend is invoked with
-build-module-from-parseable-interface, we might be trying to persist and distribute the swiftmodule that gets built. In that case, any dependencies we list might not be relevant.This probably isn't really the final answer here; what we want is some way to say which dependencies are relevant, and how they're related to how the swiftmodule that gets used. Most likely the right answer here is to limit this to dependencies within the SDK or something.
Builds on top of #21398 and #21512 because that's how I built them. Fixes the issue I spotted late in #21398.