[ParseableInterfaces] Short-circuit module loading in the PIML #23857
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
|
This seems a better approach than loading directly from the PIML -- it makes explicit an assumption from before, and it does properly handle the existence of a module without an interface. Seeing that, it will fall back to the serialized loader and skip the parseable interface loader. |
added 2 commits
April 8, 2019 10:07
Previously, the ParseableInterfaceModuleLoader relied on the assumption that, if it returned `errc::not_supported`, it would fall through the search paths and then move on to the SerializedModuleLoader. This did not anticipate the possibility of a valid .swiftinterface coming later in the search paths, which can cause issues for the standard library which is in the resource-dir and should always be loaded from there. Instead, make the module loading explicitly short-circuit when seeing `errc::not_supported`, and document it. Also add some more logging throughout `discoverLoadableModule` so we can more easily catch issues like this in the future. Fixes rdar://49479386
harlanhaskins
force-pushed
the
shock-and-awe
branch
from
c2da74a to
817b965
Compare
|
Minor concern about |
|
@swift-ci please test |
|
Build failed |
|
Build failed |
nathawes
approved these changes
Apr 8, 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.
Previously, the
ParseableInterfaceModuleLoaderrelied on the assumptionthat, if it returned
errc::not_supported, it would fall through thesearch paths and then move on to the
SerializedModuleLoader. This didnot anticipate the possibility of a valid
.swiftinterfacecoming laterin the search paths, which can cause issues for the standard library
which is in the resource-dir and should always be loaded from there.
Instead, make the module loading explicitly short-circuit when seeing
errc::not_supported, and document it.Also add some more logging throughout
discoverLoadableModuleso we canmore easily catch issues like this in the future.
Fixes rdar://49479386