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

EmptyIntersectionTypeChecker: fix error in diagnostic text

Browse Source 
Related to KT-54411
This commit is contained in:
Mikhail Glukhikh
2022-11-24 17:41:24 +01:00
committed by Space Team
parent 71c2aac280
commit 832baf81e5
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt54411.diag.txt
Vendored
+9
View File
@@ -0,0 +1,9 @@
/kt54411.kt:5:68: warning: parameter 'createNewSegment' is never used
inline fun <F : Segment<F>> AtomicRef<F>.findSegmentAndMoveForward(createNewSegment: (prev: F?) -> F) = null
^
/kt54411.kt:14:14: warning: type argument for a type parameter F has possible incompatible upper bounds: Segment<OneElementSegment<Q>>, OneElementSegment<Q>? (final class and non-final class: Segment<OneElementSegment<out Any?>>, OneElementSegment<out Any?>)
tail.findSegmentAndMoveForward(::createSegment)
^
/kt54411.kt:18:31: warning: parameter 'prev' is never used
private fun <C> createSegment(prev: OneElementSegment<C>?) = OneElementSegment<C>()
^
compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt54411.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// FIR_IDENTICAL // FIR_IDENTICAL
// !RENDER_DIAGNOSTICS_FULL_TEXT
class AtomicRef<T>(val value: T) class AtomicRef<T>(val value: T)
inline fun <F : Segment<F>> AtomicRef<F>.findSegmentAndMoveForward(createNewSegment: (prev: F?) -> F) = null inline fun <F : Segment<F>> AtomicRef<F>.findSegmentAndMoveForward(createNewSegment: (prev: F?) -> F) = null
core/compiler.common/src/org/jetbrains/kotlin/resolve/checkers/EmptyIntersectionTypeChecker.kt
+8 -4
View File
@@ -108,8 +108,9 @@ internal object EmptyIntersectionTypeChecker {
when { when {
firstSuperTypeWithSecondConstructor != null && secondSuperTypeByFirstConstructor != null -> { firstSuperTypeWithSecondConstructor != null && secondSuperTypeByFirstConstructor != null -> {
val argumentsIntersectionKind = val argumentsIntersectionKind = computeByCheckingTypeArguments(
computeByCheckingTypeArguments(firstSuperTypeWithSecondConstructor, secondSuperTypeByFirstConstructor) ?: continue firstSuperTypeWithSecondConstructor, secondSuperTypeByFirstConstructor
) ?: continue
if (argumentsIntersectionKind.kind.isDefinitelyEmpty()) if (argumentsIntersectionKind.kind.isDefinitelyEmpty())
return argumentsIntersectionKind return argumentsIntersectionKind
@@ -124,8 +125,11 @@ internal object EmptyIntersectionTypeChecker {
else -> { else -> {
// don't have incompatible supertypes so can have a common subtype only if all types are interfaces // don't have incompatible supertypes so can have a common subtype only if all types are interfaces
if (firstTypeConstructor.isFinalClassConstructor() || secondTypeConstructor.isFinalClassConstructor()) { if (firstTypeConstructor.isFinalClassConstructor() || secondTypeConstructor.isFinalClassConstructor()) {
possibleEmptyIntersectionKind = possibleEmptyIntersectionKind = EmptyIntersectionTypeInfo(
EmptyIntersectionTypeInfo(EmptyIntersectionTypeKind.SINGLE_FINAL_CLASS, firstType, secondType) if (atLeastOneInterface) EmptyIntersectionTypeKind.FINAL_CLASS_AND_INTERFACE
else EmptyIntersectionTypeKind.SINGLE_FINAL_CLASS,
firstType, secondType
)
} }
continue continue
} }
core/compiler.common/src/org/jetbrains/kotlin/types/EmptyIntersectionTypeKind.kt
+4 -2
View File
@@ -9,7 +9,8 @@ enum class EmptyIntersectionTypeKind(val description: String) {
MULTIPLE_CLASSES("multiple incompatible classes"), MULTIPLE_CLASSES("multiple incompatible classes"),
INCOMPATIBLE_SUPERTYPES("incompatible supertypes"), INCOMPATIBLE_SUPERTYPES("incompatible supertypes"),
INCOMPATIBLE_TYPE_ARGUMENTS("incompatible type arguments"), INCOMPATIBLE_TYPE_ARGUMENTS("incompatible type arguments"),
SINGLE_FINAL_CLASS("final class and interface") FINAL_CLASS_AND_INTERFACE("final class and interface"),
SINGLE_FINAL_CLASS("final class and non-final class")
} }
fun EmptyIntersectionTypeKind.isDefinitelyEmpty(): Boolean = fun EmptyIntersectionTypeKind.isDefinitelyEmpty(): Boolean =
@@ -17,4 +18,5 @@ fun EmptyIntersectionTypeKind.isDefinitelyEmpty(): Boolean =
|| this == EmptyIntersectionTypeKind.INCOMPATIBLE_SUPERTYPES || this == EmptyIntersectionTypeKind.INCOMPATIBLE_SUPERTYPES
|| this == EmptyIntersectionTypeKind.INCOMPATIBLE_TYPE_ARGUMENTS || this == EmptyIntersectionTypeKind.INCOMPATIBLE_TYPE_ARGUMENTS
fun EmptyIntersectionTypeKind.isPossiblyEmpty(): Boolean = this == EmptyIntersectionTypeKind.SINGLE_FINAL_CLASS fun EmptyIntersectionTypeKind.isPossiblyEmpty(): Boolean =
this == EmptyIntersectionTypeKind.SINGLE_FINAL_CLASS || this == EmptyIntersectionTypeKind.FINAL_CLASS_AND_INTERFACE