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

Fix tests after a semantically conflicting merge of KT-50008 and KT-65596

Browse Source
This commit is contained in:
Mikhail Glukhikh
2024-03-12 11:20:00 +01:00
committed by Space Team
parent e56a4c6edb
commit d897bfbcad
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt
Vendored
+4 -2
View File
@@ -17,12 +17,14 @@ public class Test {}
fun <T : Test> main(a1: NonPlatformTypeParameter<Any?>, a2: NonPlatformTypeParameter<Test>, x: T): Unit {
a1.foo(null)
a1.bar<Test?>(null)
a1.bar<T>(null)
// jspecify_nullness_mismatch
a1.bar<T>(<!ARGUMENT_TYPE_MISMATCH!>null<!>)
a1.bar<T>(x)
a2.foo(null)
a2.bar<Test?>(null)
a2.bar<T>(null)
// jspecify_nullness_mismatch
a2.bar<T>(<!ARGUMENT_TYPE_MISMATCH!>null<!>)
a2.bar<T>(x)
}
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NonPlatformTypeParameter.fir.kt
Vendored
+3 -3
View File
@@ -18,13 +18,13 @@ fun <T : Test> main(a1: NonPlatformTypeParameter<Any?>, a2: NonPlatformTypeParam
a1.foo(null)
a1.bar<Test?>(null)
// jspecify_nullness_mismatch
a1.bar<T>(null)
a1.bar<T>(<!ARGUMENT_TYPE_MISMATCH!>null<!>)
a1.bar<T>(x)
// jspecify_nullness_mismatch
a2.foo(null)
a2.bar<Test?>(null)
// jspecify_nullness_mismatch
a2.bar<T>(null)
a2.bar<T>(<!ARGUMENT_TYPE_MISMATCH!>null<!>)
a2.bar<T>(x)
}
}
compiler/testData/ir/irText/fakeOverrides/annotations/typeParameterAnnotationOverride.fir.ir.txt
Vendored
+2 -2
View File
@@ -246,10 +246,10 @@ FILE fqName:<root> fileName:/1.kt
$this: GET_VAR 'c: <root>.C declared in <root>.test' type=<root>.C origin=null
s: CONST Int type=kotlin.Int value=1
VAR name:k7 type:kotlin.Int? [val]
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] T of <root>.Java3? visibility:public' type=@[FlexibleNullability] kotlin.Int? origin=null
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] T of <root>.Java3? visibility:public' type=kotlin.Int? origin=null
receiver: GET_VAR 'd: <root>.D declared in <root>.test' type=<root>.D origin=null
VAR name:k8 type:kotlin.Int? [val]
CALL 'public open fun bar (): @[FlexibleNullability] kotlin.Int? declared in <root>.D' type=@[FlexibleNullability] kotlin.Int? origin=null
CALL 'public open fun bar (): @[FlexibleNullability] kotlin.Int? declared in <root>.D' type=kotlin.Int? origin=null
$this: GET_VAR 'd: <root>.D declared in <root>.test' type=<root>.D origin=null
CALL 'public open fun foo (s: @[FlexibleNullability] kotlin.Int?): kotlin.Unit declared in <root>.D' type=kotlin.Unit origin=null
$this: GET_VAR 'd: <root>.D declared in <root>.test' type=<root>.D origin=null