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

[NI] Strip only Exact-annotation preserving others during inference

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2019-04-18 14:41:24 +03:00
parent 3f08753f87
commit 8f8e33f251
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/AbstractTypeCheckerContextForConstraintSystem.kt
+2 -2
View File
@@ -45,8 +45,8 @@ abstract class AbstractTypeCheckerContextForConstraintSystem : AbstractTypeCheck
val hasExact = subType.isTypeVariableWithExact() || superType.isTypeVariableWithExact()
// we should strip annotation's because we have incorporation operation and they should be not affected
val mySubType = if (hasExact) subType.removeAnnotations() else subType
val mySuperType = if (hasExact) superType.removeAnnotations() else superType
val mySubType = if (hasExact) subType.removeExactAnnotation() else subType
val mySuperType = if (hasExact) superType.removeExactAnnotation() else superType
val result = internalAddSubtypeConstraint(mySubType, mySuperType)
if (!hasExact) return result