diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 16:08:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 16:08:55 +0000 |
| commit | 9dd1c62fe0b132d97aca2e8ae36d8714e8ee0623 (patch) | |
| tree | 5f6d072a2258af2353935cf3594419c8d2d32610 /compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt | |
| parent | 69d41efbe86b9ba85f3ed85d0a20c00c8ba81a12 (diff) | |
| parent | 52e7c3157c9a20903a44f915bc1924049d93e6a0 (diff) | |
| download | kotlin-9dd1c62fe0b132d97aca2e8ae36d8714e8ee0623.tar.gz | |
Snap for 8853699 from 52e7c3157c9a20903a44f915bc1924049d93e6a0 to studio-ee-releasestudio-2022.1.1-canarystudio-2022.1.1-beta2studio-canarystudio-2022.1.1-canary
Change-Id: I89d4fc49fc6f51e584afb500f97a791e7d8011e0
Diffstat (limited to 'compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt')
| -rw-r--r-- | compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt index 82af42268a3..274161c2d10 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt @@ -223,6 +223,11 @@ class KotlinConstraintSystemCompleter( if (!argument.atom.hasBuilderInferenceAnnotation && !useBuilderInferenceWithoutAnnotation) continue + // Imitate having builder inference annotation. TODO: Remove after getting rid of @BuilderInference + if (!argument.atom.hasBuilderInferenceAnnotation && useBuilderInferenceWithoutAnnotation) { + argument.atom.hasBuilderInferenceAnnotation = true + } + val notFixedInputTypeVariables = argument.inputTypes .flatMap { it.extractTypeVariables() }.filter { it !in fixedTypeVariables } |