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

K2: don't count use-sites of Java type parameter with nullable bounds as not null

Browse Source
This commit is contained in:
Mikhail Glukhikh
2024-03-08 13:41:25 +01:00
committed by Space Team
parent d353fd400d
commit c4bcdc42c1
14 changed files with 413 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/fakeOverrides/annotations/typeParameterAnnotationOverride.fir.ir.txt
Vendored
+16 -16
View File
@@ -93,20 +93,20 @@ FILE fqName:<root> fileName:/1.kt
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Java3'
<T>: kotlin.Int?
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.Java3<kotlin.Int?>]'
FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int?>) returnType:@[EnhancedNullability] kotlin.Int? [fake_override]
FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int?>) returnType:@[FlexibleNullability] kotlin.Int? [fake_override]
overridden:
public open fun bar (): @[EnhancedNullability] T of <root>.Java3 declared in <root>.Java3
public open fun bar (): @[FlexibleNullability] T of <root>.Java3? declared in <root>.Java3
$this: VALUE_PARAMETER name:<this> type:<root>.Java3<kotlin.Int?>
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Java3
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int?>, s:@[EnhancedNullability] kotlin.Int?) returnType:kotlin.Unit [fake_override]
FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int?>, s:@[FlexibleNullability] kotlin.Int?) returnType:kotlin.Unit [fake_override]
overridden:
public open fun foo (s: @[EnhancedNullability] T of <root>.Java3): kotlin.Unit declared in <root>.Java3
public open fun foo (s: @[FlexibleNullability] T of <root>.Java3?): kotlin.Unit declared in <root>.Java3
$this: VALUE_PARAMETER name:<this> type:<root>.Java3<kotlin.Int?>
VALUE_PARAMETER name:s index:0 type:@[EnhancedNullability] kotlin.Int?
VALUE_PARAMETER name:s index:0 type:@[FlexibleNullability] kotlin.Int?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
overridden:
public open fun hashCode (): kotlin.Int declared in <root>.Java3
@@ -122,20 +122,20 @@ FILE fqName:<root> fileName:/1.kt
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Java3'
<T>: kotlin.Int
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:E modality:FINAL visibility:public superTypes:[<root>.Java3<kotlin.Int>]'
FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int>) returnType:@[EnhancedNullability] kotlin.Int [fake_override]
FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int>) returnType:@[FlexibleNullability] kotlin.Int? [fake_override]
overridden:
public open fun bar (): @[EnhancedNullability] T of <root>.Java3 declared in <root>.Java3
public open fun bar (): @[FlexibleNullability] T of <root>.Java3? declared in <root>.Java3
$this: VALUE_PARAMETER name:<this> type:<root>.Java3<kotlin.Int>
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Java3
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int>, s:@[EnhancedNullability] kotlin.Int) returnType:kotlin.Unit [fake_override]
FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:<root>.Java3<kotlin.Int>, s:@[FlexibleNullability] kotlin.Int?) returnType:kotlin.Unit [fake_override]
overridden:
public open fun foo (s: @[EnhancedNullability] T of <root>.Java3): kotlin.Unit declared in <root>.Java3
public open fun foo (s: @[FlexibleNullability] T of <root>.Java3?): kotlin.Unit declared in <root>.Java3
$this: VALUE_PARAMETER name:<this> type:<root>.Java3<kotlin.Int>
VALUE_PARAMETER name:s index:0 type:@[EnhancedNullability] kotlin.Int
VALUE_PARAMETER name:s index:0 type:@[FlexibleNullability] kotlin.Int?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
overridden:
public open fun hashCode (): kotlin.Int declared in <root>.Java3
@@ -246,23 +246,23 @@ 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:@[EnhancedNullability] T of <root>.Java3 visibility:public' type=@[EnhancedNullability] kotlin.Int? origin=null
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] T of <root>.Java3? visibility:public' type=@[FlexibleNullability] 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 (): @[EnhancedNullability] kotlin.Int? declared in <root>.D' type=@[EnhancedNullability] kotlin.Int? origin=null
CALL 'public open fun bar (): @[FlexibleNullability] kotlin.Int? declared in <root>.D' type=@[FlexibleNullability] 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: @[EnhancedNullability] kotlin.Int?): kotlin.Unit declared in <root>.D' type=kotlin.Unit 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
s: CONST Null type=kotlin.Nothing? value=null
VAR name:k9 type:kotlin.Int [val]
TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[EnhancedNullability] T of <root>.Java3 visibility:public' type=@[EnhancedNullability] kotlin.Int origin=null
GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] T of <root>.Java3? visibility:public' type=@[FlexibleNullability] kotlin.Int? origin=null
receiver: GET_VAR 'e: <root>.E declared in <root>.test' type=<root>.E origin=null
VAR name:k10 type:kotlin.Int [val]
TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int
CALL 'public open fun bar (): @[EnhancedNullability] kotlin.Int declared in <root>.E' type=@[EnhancedNullability] kotlin.Int origin=null
CALL 'public open fun bar (): @[FlexibleNullability] kotlin.Int? declared in <root>.E' type=@[FlexibleNullability] kotlin.Int? origin=null
$this: GET_VAR 'e: <root>.E declared in <root>.test' type=<root>.E origin=null
CALL 'public open fun foo (s: @[EnhancedNullability] kotlin.Int): kotlin.Unit declared in <root>.E' type=kotlin.Unit origin=null
CALL 'public open fun foo (s: @[FlexibleNullability] kotlin.Int?): kotlin.Unit declared in <root>.E' type=kotlin.Unit origin=null
$this: GET_VAR 'e: <root>.E declared in <root>.test' type=<root>.E origin=null
s: CONST Int type=kotlin.Int value=1
VAR name:k11 type:kotlin.Int [val]
compiler/testData/ir/irText/fakeOverrides/annotations/typeParameterAnnotationOverride.fir.sig.kt.txt
Vendored
+173
View File
@@ -0,0 +1,173 @@
// CHECK:
// Mangled name: A
// Public signature: /A|null[0]
class A : Java1<Int> {
// CHECK:
// Mangled name: A#<init>(){}
// Public signature: /A.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: A#bar(){}kotlin.Int{EnhancedNullability}
// Public signature: /A.bar|-8608075298013083950[0]
// Public signature debug description: bar(){}kotlin.Int{EnhancedNullability}
/* fake */ override fun bar(): @EnhancedNullability Int
// CHECK:
// Mangled name: A#foo(kotlin.Int{EnhancedNullability}){}
// Public signature: /A.foo|6054053236451526699[0]
// Public signature debug description: foo(kotlin.Int{EnhancedNullability}){}
/* fake */ override fun foo(s: @EnhancedNullability Int): Unit
}
// CHECK:
// Mangled name: B
// Public signature: /B|null[0]
class B<T : Any> : Java1<T> {
// CHECK:
// Mangled name: B#<init>(){}
// Public signature: /B.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: B#bar(){}1:0{EnhancedNullability}
// Public signature: /B.bar|582597716914558172[0]
// Public signature debug description: bar(){}1:0{EnhancedNullability}
/* fake */ override fun bar(): @EnhancedNullability T
// CHECK:
// Mangled name: B#foo(1:0{EnhancedNullability}){}
// Public signature: /B.foo|-5059967198211209740[0]
// Public signature debug description: foo(1:0{EnhancedNullability}){}
/* fake */ override fun foo(s: @EnhancedNullability T): Unit
}
// CHECK:
// Mangled name: C
// Public signature: /C|null[0]
class C : Java2 {
// CHECK:
// Mangled name: C#<init>(){}
// Public signature: /C.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: C#bar(){}kotlin.Int{EnhancedNullability}
// Public signature: /C.bar|-8608075298013083950[0]
// Public signature debug description: bar(){}kotlin.Int{EnhancedNullability}
/* fake */ override fun bar(): @EnhancedNullability Int
// CHECK:
// Mangled name: C#foo(kotlin.Int{EnhancedNullability}){}
// Public signature: /C.foo|6054053236451526699[0]
// Public signature debug description: foo(kotlin.Int{EnhancedNullability}){}
/* fake */ override fun foo(s: @EnhancedNullability Int): Unit
}
// CHECK:
// Mangled name: D
// Public signature: /D|null[0]
class D : Java3<Int?> {
// CHECK:
// Mangled name: D#<init>(){}
// Public signature: /D.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: D#bar(){}kotlin.Int?
// Public signature: /D.bar|793910862689138186[0]
// Public signature debug description: bar(){}kotlin.Int?
/* fake */ override fun bar(): Int?
// CHECK:
// Mangled name: D#foo(kotlin.Int?){}
// Public signature: /D.foo|-4109638554625433529[0]
// Public signature debug description: foo(kotlin.Int?){}
/* fake */ override fun foo(s: Int?): Unit
}
// CHECK:
// Mangled name: E
// Public signature: /E|null[0]
class E : Java3<Int> {
// CHECK:
// Mangled name: E#<init>(){}
// Public signature: /E.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: E#bar(){}kotlin.Int?
// Public signature: /E.bar|793910862689138186[0]
// Public signature debug description: bar(){}kotlin.Int?
/* fake */ override fun bar(): Int?
// CHECK:
// Mangled name: E#foo(kotlin.Int?){}
// Public signature: /E.foo|-4109638554625433529[0]
// Public signature debug description: foo(kotlin.Int?){}
/* fake */ override fun foo(s: Int?): Unit
}
// CHECK:
// Mangled name: F
// Public signature: /F|null[0]
class F : Java4<Int> {
// CHECK:
// Mangled name: F#<init>(){}
// Public signature: /F.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: F#bar(){}kotlin.Int{EnhancedNullability}
// Public signature: /F.bar|-8608075298013083950[0]
// Public signature debug description: bar(){}kotlin.Int{EnhancedNullability}
/* fake */ override fun bar(): @EnhancedNullability Int
// CHECK:
// Mangled name: F#foo(kotlin.Int{EnhancedNullability}){}
// Public signature: /F.foo|6054053236451526699[0]
// Public signature debug description: foo(kotlin.Int{EnhancedNullability}){}
/* fake */ override fun foo(s: @EnhancedNullability Int): Unit
}
// CHECK:
// Mangled name: G
// Public signature: /G|null[0]
class G<T : Number> : Java4<T> {
// CHECK:
// Mangled name: G#<init>(){}
// Public signature: /G.<init>|-5645683436151566731[0]
// Public signature debug description: <init>(){}
constructor() /* primary */
// CHECK JVM_IR:
// Mangled name: G#bar(){}1:0{EnhancedNullability}
// Public signature: /G.bar|582597716914558172[0]
// Public signature debug description: bar(){}1:0{EnhancedNullability}
/* fake */ override fun bar(): @EnhancedNullability T
// CHECK:
// Mangled name: G#foo(1:0{EnhancedNullability}){}
// Public signature: /G.foo|-5059967198211209740[0]
// Public signature debug description: foo(1:0{EnhancedNullability}){}
/* fake */ override fun foo(s: @EnhancedNullability T): Unit
}
// CHECK:
// Mangled name: #test(A;B<kotlin.String>;C;D;E;F;G<kotlin.Int>){}
// Public signature: /test|-5249852593213170382[0]
// Public signature debug description: test(A;B<kotlin.String>;C;D;E;F;G<kotlin.Int>){}
fun test(a: A, b: B<String>, c: C, d: D, e: E, f: F, g: G<Int>): Unit
compiler/testData/ir/irText/fakeOverrides/annotations/typeParameterAnnotationOverride.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// TARGET_BACKEND: JVM
// SEPARATE_SIGNATURE_DUMP_FOR_K2
// FILE: Java1.java
import org.jetbrains.annotations.NotNull;