averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[CSSolver/SILGen] Fix solver to support function conversion with collection subtyping

Browse Source 
Fix collection subtyping relation in function argument position
by emiting special re-abstraction thunk with collection upcast.

Resolves: rdar://problem/35702810
This commit is contained in:
Pavel Yaskevich
2017-11-28 23:59:19 -08:00
parent e1db602212
commit 515520e524
4 changed files with 141 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Sema/CSSimplify.cpp
View File

@@ -2090,8 +2090,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
}
// Special implicit nominal conversions.
if (!type1->is<LValueType>() &&
kind >= ConstraintKind::Conversion) {
if (!type1->is<LValueType>() && kind >= ConstraintKind::Subtype) {
// Array -> Array.
if (isArrayType(desugar1) && isArrayType(desugar2)) {
assert(!type2->is<LValueType>() && "Unexpected lvalue type!");