From f9130ae1330df6c145c0ea82147457e42761566f Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Fri, 22 Apr 2016 22:02:14 +0300
Subject: [PATCH] Do not force calculation of lower and upper bounds in java
 flexible type.

---
 .../kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
index 17e9e8d0b9e..0be888c1043 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
@@ -306,8 +306,8 @@ class LazyJavaTypeResolver(
                 return super.getCapability(capabilityClass)
             }
 
-            override val isTypeVariable: Boolean = lowerBound.constructor == upperBound.constructor
-                                                   && lowerBound.constructor.declarationDescriptor is TypeParameterDescriptor
+            override val isTypeVariable: Boolean get() = lowerBound.constructor.declarationDescriptor is TypeParameterDescriptor
+                                                         && lowerBound.constructor == upperBound.constructor
 
             override fun substitutionResult(replacement: KotlinType): KotlinType {
                 return if (replacement.isFlexible()) replacement