[Serialization] Use the correct module for the nested type fast path. #11018
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
Fix-up for 03e1e3b, which fixes the crash caused by the new test case. More https://bugs.swift.org/browse/SR-5284
|
@swift-ci Please test |
|
Sorry, Michael, I guess I do need someone to look at the serialization part, since I didn't get it right. |
jrose-apple
commented
Jul 17, 2017
| @@ -1343,9 +1343,13 @@ ModuleFile::resolveCrossReference(ModuleDecl *baseModule, uint32_t pathLen) { | |||
| nestedType = containingFile->lookupNestedType(memberName, baseType); | |||
| } | |||
| } else { | |||
| // Fault in extensions, then ask every serialized AST in the module. | |||
| // Fault in extensions, then ask every file in the module. | |||
| ModuleDecl *extensionModule = M; | |||
There was a problem hiding this comment.
M here is the module specified by the cross-reference path; it's omitted if you're supposed to look in the same module. This will be made clearer in the future when everything gets refactored as @milseman suggested.
|
Looks good to me. |
jckarter
approved these changes
Jul 18, 2017
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Jul 18, 2017
…swiftlang#11018) Fix-up for 03e1e3b, which fixes the crash caused by the new test case. More https://bugs.swift.org/browse/SR-5284
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.
Fix-up for #10956, which fixes the crash caused by the new test case I thought of slightly too late.
More SR-5284 / rdar://problem/32926560.