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

[FIR] Check compatibility of equality call between IT by component of each type

Browse Source 
^KT-48113 Fixed
This commit is contained in:
Dmitriy Novozhilov
2021-08-27 11:00:32 +03:00
committed by TeamCityServer
parent 5bdfa14a37
commit 67dd23354c
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/IntersectionWithJavaString.kt
Vendored
+4 -2
View File
@@ -1,5 +1,7 @@
// FULL_JDK // FULL_JDK
// ISSUE: KT-48113
fun collapse(path: String) { fun collapse(path: String) {
val result = (path as java.lang.String).replace("123", "456") val result = (path as java.lang.String).replace("123", "456")
if (<!EQUALITY_NOT_APPLICABLE_WARNING!>result !== path<!>) {} if (result !== path) {}
} }
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/ConeTypeCompatibilityChecker.kt
+5 -9
View File
@@ -64,21 +64,17 @@ internal object ConeTypeCompatibilityChecker {
} }
fun ConeInferenceContext.isCompatible(a: ConeKotlinType, b: ConeKotlinType): Compatibility { fun ConeInferenceContext.isCompatible(a: ConeKotlinType, b: ConeKotlinType): Compatibility {
val aUnwrap = unwrap(a) if (a is ConeIntersectionType) {
val bUnwrap = unwrap(b) return a.intersectedTypes.minOf { isCompatible(it, b) }
if (aUnwrap.containsAll(bUnwrap) || bUnwrap.containsAll(aUnwrap)) { }
return Compatibility.COMPATIBLE if (b is ConeIntersectionType) {
return b.intersectedTypes.minOf { isCompatible(a, it) }
} }
val intersectionType = intersectTypesOrNull(listOf(a, b)) as? ConeIntersectionType ?: return Compatibility.COMPATIBLE val intersectionType = intersectTypesOrNull(listOf(a, b)) as? ConeIntersectionType ?: return Compatibility.COMPATIBLE
return intersectionType.intersectedTypes.areCompatible(this) return intersectionType.intersectedTypes.areCompatible(this)
} }
private fun unwrap(type: ConeKotlinType): Collection<ConeKotlinType> = when (type) {
is ConeIntersectionType -> type.intersectedTypes
else -> listOf(type)
}
private fun Collection<ConeKotlinType>.areCompatible(ctx: ConeInferenceContext): Compatibility { private fun Collection<ConeKotlinType>.areCompatible(ctx: ConeInferenceContext): Compatibility {
// If all types are nullable, then `null` makes the given types compatible. // If all types are nullable, then `null` makes the given types compatible.
if (all { with(ctx) { it.isNullableType() } }) return Compatibility.COMPATIBLE if (all { with(ctx) { it.isNullableType() } }) return Compatibility.COMPATIBLE