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

Expand upon r30921 to allow for remapping against parameter tuples consisting of a single vararg entry. (rdar://problem/18083599)

Browse Source 
Swift SVN r30922
This commit is contained in:
Joe Pamer
2015-08-01 20:18:32 +00:00
parent 3fab0eb2db
commit d4a9aba927
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Sema/CSSimplify.cpp
View File

@@ -1396,13 +1396,14 @@ ConstraintSystem::matchTypes(Type type1, Type type2, TypeMatchKind kind,
}
// We need to be careful about mapping 'raw' argument type variables to
// parameter tuples containing default args. If we naively bind the type
// variable to the parameter tuple, we'll later end up looking to whatever
// expression created the type variable to find the declarations for default
// arguments. This can obviously be problematic if the expression in
// question is not an application. (For example, We don't want to introspect
// an 'if' expression to see if it has default arguments.) Instead, we
// should bind the type variable to the first element type of the tuple.
// parameter tuples containing default args, or varargs in the first
// position. If we naively bind the type variable to the parameter tuple,
// we'll later end up looking to whatever expression created the type
// variable to find the declarations for default arguments. This can
// obviously be problematic if the expression in question is not an
// application. (For example, We don't want to introspect an 'if' expression
// to see if it has default arguments.) Instead, we should bind the type
// variable to the first element type of the tuple.
case TypeMatchKind::ArgumentTupleConversion:
if (typeVar1 &&
!typeVar1->getImpl().literalConformanceProto &&
@@ -1413,9 +1414,10 @@ ConstraintSystem::matchTypes(Type type1, Type type2, TypeMatchKind kind,
auto tupleTy = type2->getAs<TupleType>();
if (tupleTy &&
tupleTy->getElementTypes().size() > 1 &&
tupleTy->hasAnyDefaultValues()) {
!tupleTy->getElements().empty() &&
(tupleTy->hasAnyDefaultValues() ||
tupleTy->getElement(0).isVararg())) {
// Look through vararg types, if necessary.
auto tupleElt = tupleTy->getElement(0);
auto tupleEltTy = tupleElt.isVararg() ?