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

Check postponed type variables to determine suitability for builder inference (during shouldRunCompletion check) more careful

Browse Source 
^KT-42139 Fixed
This commit is contained in:
Victor Petukhov
2021-08-03 13:00:46 +03:00
committed by teamcityserver
parent cf3bd016be
commit b6cb393796
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt
+10 -5
View File
@@ -94,7 +94,7 @@ class BuilderInferenceSession(
return subResolvedAtoms?.any { it.hasPostponed() } == true return subResolvedAtoms?.any { it.hasPostponed() } == true
} }
if (!candidate.isSuitableForBuilderInference()) { if (!candidate.resolvedCall.isSuitableForBuilderInference()) {
return true return true
} }
@@ -108,13 +108,18 @@ class BuilderInferenceSession(
} || candidate.getSubResolvedAtoms().any { it.hasPostponed() } } || candidate.getSubResolvedAtoms().any { it.hasPostponed() }
} }
private fun KotlinResolutionCandidate.isSuitableForBuilderInference(): Boolean { private fun ResolvedCallAtom.isSuitableForBuilderInference(): Boolean {
val extensionReceiver = resolvedCall.extensionReceiverArgument val extensionReceiver = extensionReceiverArgument
val dispatchReceiver = resolvedCall.dispatchReceiverArgument val dispatchReceiver = dispatchReceiverArgument
val resolvedAtoms = subResolvedAtoms
return when { return when {
resolvedAtoms != null && resolvedAtoms.map { it.atom }.filterIsInstance<SubKotlinCallArgument>().any {
it.callResult.resultCallAtom.isSuitableForBuilderInference()
} -> true
extensionReceiver == null && dispatchReceiver == null -> false extensionReceiver == null && dispatchReceiver == null -> false
dispatchReceiver?.receiver?.stableType?.containsStubType() == true -> true dispatchReceiver?.receiver?.stableType?.containsStubType() == true -> true
extensionReceiver?.receiver?.stableType?.containsStubType() == true -> resolvedCall.candidateDescriptor.hasBuilderInferenceAnnotation() extensionReceiver?.receiver?.stableType?.containsStubType() == true -> candidateDescriptor.hasBuilderInferenceAnnotation()
else -> false else -> false
} }
} }
compiler/testData/codegen/box/inference/builderInference/kt42139.kt
Vendored
+3 -3
View File
@@ -11,12 +11,12 @@ fun f1(): Sequence<List<Int>> = sequence {
} }
fun f2(): Sequence<List<Int>> = sequence { fun f2(): Sequence<List<Int>> = sequence {
select(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>yield<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>myEmptyList<!>()), yield(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>myEmptyList<!>())) select(yield(myEmptyList()), yield(myEmptyList()))
} }
fun f3(): Sequence<List<Int>> = sequence { fun f3(): Sequence<List<Int>> = sequence {
if (true) <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>yield<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>myEmptyList<!>()) // [NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER] Not enough information to infer type variable T if (true) yield(myEmptyList()) // [NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER] Not enough information to infer type variable T
else yield(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>myEmptyList<!>()) // [NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER] Not enough information to infer type variable T else yield(myEmptyList()) // [NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER] Not enough information to infer type variable T
} }
fun box(): String { fun box(): String {