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

Temporary hack for KT-6320

Browse Source
This commit is contained in:
Stanislav Erokhin
2014-12-02 14:56:21 +03:00
parent b55114055e
commit 99ec8952e1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
+2
View File
@@ -391,6 +391,8 @@ public class ConstraintSystemImpl implements ConstraintSystem {
// fun <T> foo(i: Int) : T { ... return foo(i); } => T <: T // fun <T> foo(i: Int) : T { ... return foo(i); } => T <: T
if (isMyTypeVariable(subType) && isMyTypeVariable(superType) && JetTypeChecker.DEFAULT.equalTypes(subType, superType)) return; 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) : assert !isMyTypeVariable(subType) || !isMyTypeVariable(superType) :
"The constraint shouldn't contain different type variables on both sides: " + subType + " <: " + superType; "The constraint shouldn't contain different type variables on both sides: " + subType + " <: " + superType;