Sema fixes for SE-0110 #6908
Merged
Sema fixes for SE-0110 #6908
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
slavapestov
force-pushed
the
sema-substitution-fixes
branch
from
3f130e1 to
977b7c8
Compare
slavapestov
changed the title
slavapestov
force-pushed
the
sema-substitution-fixes
branch
2 times, most recently
from
39e956d to
f37a1a4
Compare
|
@swift-ci Please test |
|
Build failed |
slavapestov
force-pushed
the
sema-substitution-fixes
branch
from
f37a1a4 to
af274fa
Compare
|
@swift-ci Please test Linux |
slavapestov
changed the title
A change was recently made to canonicalize replacement types in GenericSignature::getSubstitutions(). This resulted in ParenType being stripped off, which triggered the 'tuple splat' diagnostic on code that was accepted in Swift 3.0. I believe this canonicalization step is unnecessary; we canonicalize using a brand-new ArchetypeBuilder that has no generic signature added to it, so this is just equivalent to a call to getCanonicalType(). Also adding the generic signature in question to the builder is not the right answer either; the replacement types might be written in terms of a different generic signature, or possibly in terms of archetypes. Taking this out seems to have no effect except changing a few SIL dumps to contain sugared types, which should be harmless. Part of fixing <rdar://problem/29739905>.
We would lose ParenType sugar in function types as a result. Fixes part of <rdar://problem/29739905>.
Completes the fix of <rdar://problem/29739905>.
Instead of passing the original type and DeclContext, we just need a GenericSignature.
…Swift 3 compatibility mode
ConstraintSystem::simplifyType() replaced types with their fixed types from the global map. Solution::simplifyType() replaced types with their fixed types from the current bindings. There were some minor differences between the two, and some dead code.
slavapestov
force-pushed
the
sema-substitution-fixes
branch
from
af274fa to
c86b5ae
Compare
|
@swift-ci Please smoke test |
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.
Fixes some issues with argument tuple handling, including compatibility problems in Swift 3 mode, and further tightening up and testing of the Swift 4 behavior.