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

[NI] Force variable substitution for properties with stub types

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2020-02-17 04:46:26 +03:00
parent 155b716e7e
commit 724bb1b134
6 changed files with 418 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
+4 -3
View File
@@ -773,13 +773,14 @@ class NewResolvedCallImpl<D : CallableDescriptor>(
}
is FunctionDescriptor -> candidateDescriptor.substituteInferredVariablesAndApproximate(substitutor)
is PropertyDescriptor -> {
val shouldRunApproximation = candidateDescriptor.returnType?.let { type ->
val shouldForceApproximationAndSubstitution = candidateDescriptor.returnType?.let { type ->
type.contains { it is NewCapturedType } ||
type.contains { it.constructor is IntegerLiteralTypeConstructor } ||
type.contains { it is DefinitelyNotNullType }
type.contains { it is DefinitelyNotNullType } ||
type.contains { it is StubType }
} ?: false
if (candidateDescriptor.typeParameters.isNotEmpty() || shouldRunApproximation)
if (candidateDescriptor.typeParameters.isNotEmpty() || shouldForceApproximationAndSubstitution)
candidateDescriptor.substituteInferredVariablesAndApproximate(substitutor)
else
candidateDescriptor