From 9d517d914b90f79dc5a62c0ba9a16ee19f23df27 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 9 Sep 2019 18:27:51 +0300
Subject: [PATCH] Minor. Get rid of redundant elvis operand in
 AbstractConeSubstitutor::substituteOrNull

---
 .../kotlin/fir/resolve/substitution/ConeSubstitutor.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/substitution/ConeSubstitutor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/substitution/ConeSubstitutor.kt
index 75e8ef5b97e..447a47f1460 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/substitution/ConeSubstitutor.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/substitution/ConeSubstitutor.kt
@@ -62,7 +62,7 @@ abstract class AbstractConeSubstitutor : ConeSubstitutor() {
 
     override fun substituteOrNull(type: ConeKotlinType): ConeKotlinType? {
         val newType = substituteType(type)
-        return (newType ?: type.substituteRecursive()) ?: newType
+        return (newType ?: type.substituteRecursive())
     }
 
     private fun ConeKotlinType.substituteRecursive(): ConeKotlinType? {