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

Minor performance improvements in tryToCompleteWithBuilderInference

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-01-20 18:28:56 +03:00
committed by teamcity
parent 98cdc95cd0
commit 756ff6cf43
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConstraintSystemCompleter.kt
+3 -2
View File
@@ -188,14 +188,15 @@ class ConstraintSystemCompleter(components: BodyResolveComponents, private val c
// We assume useBuilderInferenceWithoutAnnotation = true for FIR // We assume useBuilderInferenceWithoutAnnotation = true for FIR
val builder = getBuilder()
for (argument in lambdaArguments) { for (argument in lambdaArguments) {
val notFixedInputTypeVariables = argument.inputTypes val notFixedInputTypeVariables = argument.inputTypes
.map { it.extractTypeVariables() }.flatten().filter { it !in fixedTypeVariables } .flatMap { it.extractTypeVariables() }.filter { it !in fixedTypeVariables }
if (notFixedInputTypeVariables.isEmpty()) continue if (notFixedInputTypeVariables.isEmpty()) continue
for (variable in notFixedInputTypeVariables) { for (variable in notFixedInputTypeVariables) {
getBuilder().markPostponedVariable(notFixedTypeVariables.getValue(variable).typeVariable) builder.markPostponedVariable(notFixedTypeVariables.getValue(variable).typeVariable)
} }
analyze(argument) analyze(argument)
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/KotlinConstraintSystemCompleter.kt
+3 -2
View File
@@ -216,17 +216,18 @@ class KotlinConstraintSystemCompleter(
val useBuilderInferenceWithoutAnnotation = val useBuilderInferenceWithoutAnnotation =
languageVersionSettings.supportsFeature(LanguageFeature.UseBuilderInferenceWithoutAnnotation) languageVersionSettings.supportsFeature(LanguageFeature.UseBuilderInferenceWithoutAnnotation)
val builder = getBuilder()
for (argument in lambdaArguments) { for (argument in lambdaArguments) {
if (!argument.atom.hasBuilderInferenceAnnotation && !useBuilderInferenceWithoutAnnotation) if (!argument.atom.hasBuilderInferenceAnnotation && !useBuilderInferenceWithoutAnnotation)
continue continue
val notFixedInputTypeVariables = argument.inputTypes val notFixedInputTypeVariables = argument.inputTypes
.map { it.extractTypeVariables() }.flatten().filter { it !in fixedTypeVariables } .flatMap { it.extractTypeVariables() }.filter { it !in fixedTypeVariables }
if (notFixedInputTypeVariables.isEmpty()) continue if (notFixedInputTypeVariables.isEmpty()) continue
for (variable in notFixedInputTypeVariables) { for (variable in notFixedInputTypeVariables) {
getBuilder().markPostponedVariable(notFixedTypeVariables.getValue(variable).typeVariable) builder.markPostponedVariable(notFixedTypeVariables.getValue(variable).typeVariable)
} }
analyze(argument) analyze(argument)