ASTContext: Recompute the insert position in getSpecializedConformanc… #17904
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
…e after the SpecializedProtocolConformance constructor The constructor can modify the SpecializedConformances FoldingSet so that the insertPos is no longer valid. It calls computeConditionalRequirements which calls Type::subst which recursively can call getSpecializedConformance again. This bug manifest itself either as memory error with libgmalloc or as spurious errors later on. rdar://42082352
|
@swift-ci Please test |
rudkx
reviewed
Jul 12, 2018
lib/AST/ASTContext.cpp
Outdated
| @@ -1835,6 +1835,8 @@ ASTContext::getSpecializedConformance(Type type, | |||
| auto result | |||
| = new (*this, arena) SpecializedProtocolConformance(type, generic, | |||
| substitutions); | |||
| auto node = specializedConformances.FindNodeOrInsertPos(id, insertPos); | |||
| assert(!node); | |||
There was a problem hiding this comment.
You'll get an unused variable warning on this in a no-asserts build.
There was a problem hiding this comment.
Oh, right thanks!
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jul 26, 2018
Arnold fixed this by re-computing the insert position in getSpecializedConformance(), with swiftlang#17904. Fixes rdar://problem/35797159.
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.
…e after the SpecializedProtocolConformance constructor
The constructor can modify the SpecializedConformances FoldingSet so that the
insertPos is no longer valid. It calls computeConditionalRequirements which
calls Type::subst which recursively can call getSpecializedConformance again.
This bug manifest itself either as memory error with libgmalloc or as
spurious errors later on.
rdar://42082352