azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Minor] Refactor resulting descriptor substitution in call transformer

Browse Source
This commit is contained in:
Pavel Kirpichenkov
2019-11-08 12:29:40 +03:00
parent ea66f02035
commit 3122f2704c
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
+26 -22
View File
@@ -697,28 +697,7 @@ class NewResolvedCallImpl<D : CallableDescriptor>(
}
@Suppress("UNCHECKED_CAST")
resultingDescriptor = run {
val candidateDescriptor = resolvedCallAtom.candidateDescriptor
val returnType = resolvedCallAtom.candidateDescriptor.returnType
val shouldRunApproximation = returnType?.let { type ->
type.contains { it is NewCapturedType } ||
type.contains { it.constructor is IntegerLiteralTypeConstructor } ||
type.contains { it is DefinitelyNotNullType }
} ?: false
when {
candidateDescriptor is FunctionDescriptor ||
(candidateDescriptor is PropertyDescriptor &&
(candidateDescriptor.typeParameters.isNotEmpty() || shouldRunApproximation)) ->
// this code is very suspicious. Now it is very useful for BE, because they cannot do nothing with captured types,
// but it seems like temporary solution.
candidateDescriptor.substitute(resolvedCallAtom.freshVariablesSubstitutor).substituteAndApproximateTypes(
substitutor ?: FreshVariableNewTypeSubstitutor.Empty, typeApproximator
)
else ->
candidateDescriptor
}
} as D
resultingDescriptor = substitutedResultingDescriptor(substitutor) as D
typeArguments = resolvedCallAtom.freshVariablesSubstitutor.freshVariables.map {
val substituted = (substitutor ?: FreshVariableNewTypeSubstitutor.Empty).safeSubstitute(it.defaultType)
@@ -730,6 +709,31 @@ class NewResolvedCallImpl<D : CallableDescriptor>(
calculateExpectedTypeForSamConvertedArgumentMap(substitutor)
}
private fun substitutedResultingDescriptor(substitutor: NewTypeSubstitutor?) =
when (val candidateDescriptor = resolvedCallAtom.candidateDescriptor) {
is FunctionDescriptor -> candidateDescriptor.substituteInferredVariablesAndApproximate(substitutor)
is PropertyDescriptor -> {
val shouldRunApproximation = candidateDescriptor.returnType?.let { type ->
type.contains { it is NewCapturedType } ||
type.contains { it.constructor is IntegerLiteralTypeConstructor } ||
type.contains { it is DefinitelyNotNullType }
} ?: false
if (candidateDescriptor.typeParameters.isNotEmpty() || shouldRunApproximation)
candidateDescriptor.substituteInferredVariablesAndApproximate(substitutor)
else
candidateDescriptor
}
else -> candidateDescriptor
}
private fun CallableDescriptor.substituteInferredVariablesAndApproximate(substitutor: NewTypeSubstitutor?): CallableDescriptor {
return substitute(resolvedCallAtom.freshVariablesSubstitutor)
.substituteAndApproximateTypes(
substitutor ?: FreshVariableNewTypeSubstitutor.Empty, typeApproximator
)
}
fun getExpectedTypeForSamConvertedArgument(valueArgument: ValueArgument): UnwrappedType? =
expedtedTypeForSamConvertedArgumentMap?.get(valueArgument)