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

[FIR] Provide correct comparison of captured types

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-08 16:16:22 +03:00
parent b5f8fec213
commit 2f61a2f56f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+4 -2
View File
@@ -186,7 +186,8 @@ data class ConeCapturedType(
other as ConeCapturedType other as ConeCapturedType
if (lowerType != other.lowerType) return false if (lowerType != other.lowerType) return false
if (constructor != other.constructor) return false if (constructor.projection != other.constructor.projection) return false
if (constructor.typeParameterMarker != other.constructor.typeParameterMarker) return false
if (captureStatus != other.captureStatus) return false if (captureStatus != other.captureStatus) return false
if (nullability != other.nullability) return false if (nullability != other.nullability) return false
@@ -196,7 +197,8 @@ data class ConeCapturedType(
override fun hashCode(): Int { override fun hashCode(): Int {
var result = 0 var result = 0
result = 31 * result + (lowerType?.hashCode() ?: 0) result = 31 * result + (lowerType?.hashCode() ?: 0)
result = 31 * result + constructor.hashCode() result = 31 * result + constructor.projection.hashCode()
result = 31 * result + constructor.typeParameterMarker.hashCode()
result = 31 * result + captureStatus.hashCode() result = 31 * result + captureStatus.hashCode()
result = 31 * result + nullability.hashCode() result = 31 * result + nullability.hashCode()
return result return result