From df88926ef899fb850e2672497de4702631fd8bc7 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 28 Sep 2017 18:58:27 +0300 Subject: [PATCH] Minor. Get rid of redundant var The lazyness here is redundant since SmartList doesn't make a lot of harm, but at the same time `var` here leads to another kotlin/jvm/internal/Ref$ObjectRef instance --- .../kotlin/types/checker/NewKotlinTypeChecker.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/checker/NewKotlinTypeChecker.kt b/core/descriptors/src/org/jetbrains/kotlin/types/checker/NewKotlinTypeChecker.kt index 49663884f55..055571ecb40 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/checker/NewKotlinTypeChecker.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/NewKotlinTypeChecker.kt @@ -291,18 +291,14 @@ object NewKotlinTypeChecker : KotlinTypeChecker { emptyList() } - var result: MutableList? = null + val result: MutableList = SmartList() anySupertype(baseType, { false }) { val current = captureFromArguments(it, CaptureStatus.FOR_SUBTYPING) ?: it when { areEqualTypeConstructors(current.constructor, constructor) -> { - if (result == null) { - result = SmartList() - } - result!!.add(current) - + result.add(current) SupertypesPolicy.None } current.arguments.isEmpty() -> { @@ -314,7 +310,7 @@ object NewKotlinTypeChecker : KotlinTypeChecker { } } - return result ?: emptyList() + return result } private val ClassDescriptor.isCommonFinalClass: Boolean