Changed default value for 'getNestedTypeVariables()'

This commit is contained in:
Svetlana Isakova
2015-07-08 12:30:22 +03:00
parent 722a49767a
commit d2dc44379e
4 changed files with 6 additions and 6 deletions
@@ -69,7 +69,7 @@ private fun CallableDescriptor.hasReturnTypeDependentOnUninferredParams(constrai
val returnType = getReturnType() ?: return false
val nestedTypeVariables = with (constraintSystem as ConstraintSystemImpl) {
returnType.getNestedTypeVariables(original = true)
returnType.getNestedTypeVariables()
}
return nestedTypeVariables.any { constraintSystem.getTypeBounds(it).value == null }
}
@@ -164,7 +164,7 @@ class GenericCandidateResolver(
val returnType = candidateDescriptor.getReturnType() ?: return false
val nestedTypeVariables = with (argumentConstraintSystem) {
returnType.getNestedTypeVariables(original = true)
returnType.getNestedTypeVariables()
}
// we add an additional type variable only if no information is inferred for it.
// otherwise we add currently inferred return type as before