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

AbstractTypeChecker: fix special case with CapturedType as self type argument

Browse Source 
#KT-53908 Fixed
May fix also KT-53271
This commit is contained in:
Mikhail Glukhikh
2022-09-19 10:38:19 +02:00
committed by Space
parent ed21011183
commit a4b2a8c4ea
5 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/writerAppenderExampleRecursive.fir.kt
Vendored
+3 -3
View File
@@ -26,10 +26,10 @@ fun test() {
} }
fun testJava(appender: JavaWriterAppender) { fun testJava(appender: JavaWriterAppender) {
<!DEBUG_INFO_EXPRESSION_TYPE("JavaWriterAppender.Builder1<*>..JavaWriterAppender.Builder1<*>?!"), NEW_INFERENCE_ERROR!>appender.newBuilder()<!> <!DEBUG_INFO_EXPRESSION_TYPE("JavaWriterAppender.Builder1<*>..JavaWriterAppender.Builder1<*>?!")!>appender.newBuilder()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("JavaWriterAppender.Builder1<out JavaWriterAppender.Builder1<*>..JavaWriterAppender.Builder1<*>?!>"), NEW_INFERENCE_ERROR!>appender.Builder1()<!> <!DEBUG_INFO_EXPRESSION_TYPE("JavaWriterAppender.Builder1<out JavaWriterAppender.Builder1<*>..JavaWriterAppender.Builder1<*>?!>")!>appender.Builder1()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("JavaWriterAppender.Builder1<*> & JavaWriterAppender.Builder2<*>..JavaWriterAppender.Builder1<*>? & JavaWriterAppender.Builder2<*>?"), NEW_INFERENCE_ERROR!>appender.intersectTwoSelfTypes()<!> <!DEBUG_INFO_EXPRESSION_TYPE("JavaWriterAppender.Builder1<*> & JavaWriterAppender.Builder2<*>..JavaWriterAppender.Builder1<*>? & JavaWriterAppender.Builder2<*>?")!>appender.intersectTwoSelfTypes()<!>
} }
object WriterAppender { object WriterAppender {
compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// FIR_DUMP
// FILE: GenericContainer.java
public class GenericContainer<SELF extends GenericContainer<SELF>> {
public GenericContainer(String dockerImageName) {
}
}
// FILE: test.kt
val container = <!NEW_INFERENCE_ERROR!>GenericContainer("nginx")<!>
compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: test.kt FILE: test.kt
public final val container: R|GenericContainer<out ft<GenericContainer<*>, GenericContainer<*>?>>| = <CS errors: /GenericContainer.GenericContainer>#<R|CapturedType(*)|>(String(nginx)) public final val container: R|GenericContainer<out ft<GenericContainer<*>, GenericContainer<*>?>>| = R|/GenericContainer.GenericContainer|<R|CapturedType(*)|>(String(nginx))
public get(): R|GenericContainer<out ft<GenericContainer<*>, GenericContainer<*>?>>| public get(): R|GenericContainer<out ft<GenericContainer<*>, GenericContainer<*>?>>|
compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// FIR_DUMP // FIR_DUMP
// FILE: GenericContainer.java // FILE: GenericContainer.java
core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
+2 -2
View File
@@ -596,8 +596,8 @@ object AbstractTypeChecker {
): TypeParameterMarker? { ): TypeParameterMarker? {
for (i in 0 until baseType.argumentsCount()) { for (i in 0 until baseType.argumentsCount()) {
val typeArgument = baseType.getArgument(i).takeIf { !it.isStarProjection() }?.getType() ?: continue val typeArgument = baseType.getArgument(i).takeIf { !it.isStarProjection() }?.getType() ?: continue
val areBothTypesCaptured = val areBothTypesCaptured = typeArgument.lowerBoundIfFlexible().originalIfDefinitelyNotNullable().isCapturedType() &&
typeArgument.lowerBoundIfFlexible().isCapturedType() && targetType.lowerBoundIfFlexible().isCapturedType() targetType.lowerBoundIfFlexible().originalIfDefinitelyNotNullable().isCapturedType()
if (typeArgument == targetType || (areBothTypesCaptured && typeArgument.typeConstructor() == targetType.typeConstructor())) { if (typeArgument == targetType || (areBothTypesCaptured && typeArgument.typeConstructor() == targetType.typeConstructor())) {
return baseType.typeConstructor().getParameter(i) return baseType.typeConstructor().getParameter(i)