From 99ec8952e192d3f95bb1974e71bbfca1d2e92c78 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 2 Dec 2014 14:56:21 +0300 Subject: [PATCH] Temporary hack for KT-6320 --- .../jet/lang/resolve/calls/inference/ConstraintSystemImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java index f6859d4ed98..31534f78dca 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java @@ -391,6 +391,8 @@ public class ConstraintSystemImpl implements ConstraintSystem { // fun foo(i: Int) : T { ... return foo(i); } => T <: T if (isMyTypeVariable(subType) && isMyTypeVariable(superType) && JetTypeChecker.DEFAULT.equalTypes(subType, superType)) return; + //todo temporary hack KT-6320 + if (isMyTypeVariable(subType) && isMyTypeVariable(superType)) return; assert !isMyTypeVariable(subType) || !isMyTypeVariable(superType) : "The constraint shouldn't contain different type variables on both sides: " + subType + " <: " + superType;