diff --git a/compiler/testData/ir/irText/classes/classes.txt b/compiler/testData/ir/irText/classes/classes.txt index aec68a162b7..3b53b279962 100644 --- a/compiler/testData/ir/irText/classes/classes.txt +++ b/compiler/testData/ir/irText/classes/classes.txt @@ -83,9 +83,9 @@ FILE fqName: fileName:/classes.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnumClass> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnumClass>) returnType:java.lang.Class<.TestEnumClass?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnumClass>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnumClass?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnumClass> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnumClass>, other:.TestEnumClass) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/enum.txt b/compiler/testData/ir/irText/classes/enum.txt index c714fc031c8..5aef9201e41 100644 --- a/compiler/testData/ir/irText/classes/enum.txt +++ b/compiler/testData/ir/irText/classes/enum.txt @@ -20,9 +20,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum1>) returnType:java.lang.Class<.TestEnum1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum1>, other:.TestEnum1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -98,9 +98,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum2>) returnType:java.lang.Class<.TestEnum2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum2>, other:.TestEnum2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -169,9 +169,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestEnum3 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum3> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum3>) returnType:java.lang.Class<.TestEnum3?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum3>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum3?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestEnum3?>? [fake_override] declared in .TestEnum3 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum3?>? [fake_override] declared in .TestEnum3 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum3> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum3>, other:.TestEnum3) returnType:kotlin.Int [fake_override,operator] overridden: @@ -213,9 +213,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum3> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum3>) returnType:java.lang.Class<.TestEnum3?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum3>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum3?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum3> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum3>, other:.TestEnum3) returnType:kotlin.Int [fake_override,operator] overridden: @@ -297,9 +297,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestEnum4 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>) returnType:java.lang.Class<.TestEnum4?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum4?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestEnum4?>? [fake_override] declared in .TestEnum4 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum4?>? [fake_override] declared in .TestEnum4 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>, other:.TestEnum4) returnType:kotlin.Int [fake_override,operator] overridden: @@ -378,9 +378,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestEnum4 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>) returnType:java.lang.Class<.TestEnum4?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum4?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestEnum4?>? [fake_override] declared in .TestEnum4 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum4?>? [fake_override] declared in .TestEnum4 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>, other:.TestEnum4) returnType:kotlin.Int [fake_override,operator] overridden: @@ -428,9 +428,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>) returnType:java.lang.Class<.TestEnum4?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum4?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum4>, other:.TestEnum4) returnType:kotlin.Int [fake_override,operator] overridden: @@ -506,9 +506,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum5> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum5>) returnType:java.lang.Class<.TestEnum5?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum5>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum5?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum5> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum5>, other:.TestEnum5) returnType:kotlin.Int [fake_override,operator] overridden: @@ -598,9 +598,9 @@ FILE fqName: fileName:/enum.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum6> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum6>) returnType:java.lang.Class<.TestEnum6?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum6>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum6?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum6> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum6>, other:.TestEnum6) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/enumClassModality.txt b/compiler/testData/ir/irText/classes/enumClassModality.txt index 2ecff18a226..1345a759f9f 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.txt @@ -17,9 +17,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestFinalEnum1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum1>) returnType:java.lang.Class<.TestFinalEnum1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestFinalEnum1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestFinalEnum1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum1>, other:.TestFinalEnum1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -87,9 +87,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestFinalEnum2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum2>) returnType:java.lang.Class<.TestFinalEnum2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestFinalEnum2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestFinalEnum2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum2>, other:.TestFinalEnum2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -147,9 +147,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestFinalEnum3> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum3>) returnType:java.lang.Class<.TestFinalEnum3?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum3>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestFinalEnum3?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestFinalEnum3> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestFinalEnum3>, other:.TestFinalEnum3) returnType:kotlin.Int [fake_override,operator] overridden: @@ -218,9 +218,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestOpenEnum1 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum1>) returnType:java.lang.Class<.TestOpenEnum1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestOpenEnum1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestOpenEnum1?>? [fake_override] declared in .TestOpenEnum1 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestOpenEnum1?>? [fake_override] declared in .TestOpenEnum1 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum1>, other:.TestOpenEnum1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -256,9 +256,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum1>) returnType:java.lang.Class<.TestOpenEnum1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestOpenEnum1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum1>, other:.TestOpenEnum1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -325,9 +325,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestOpenEnum2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum2>) returnType:java.lang.Class<.TestOpenEnum2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestOpenEnum2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestOpenEnum2?>? [fake_override] declared in .TestOpenEnum2 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestOpenEnum2?>? [fake_override] declared in .TestOpenEnum2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum2>, other:.TestOpenEnum2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -370,9 +370,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum2>) returnType:java.lang.Class<.TestOpenEnum2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestOpenEnum2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestOpenEnum2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestOpenEnum2>, other:.TestOpenEnum2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -439,9 +439,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestAbstractEnum1 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum1>) returnType:java.lang.Class<.TestAbstractEnum1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestAbstractEnum1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestAbstractEnum1?>? [fake_override] declared in .TestAbstractEnum1 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestAbstractEnum1?>? [fake_override] declared in .TestAbstractEnum1 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum1>, other:.TestAbstractEnum1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -483,9 +483,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum1>) returnType:java.lang.Class<.TestAbstractEnum1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestAbstractEnum1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum1>, other:.TestAbstractEnum1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -569,9 +569,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestAbstractEnum2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum2>) returnType:java.lang.Class<.TestAbstractEnum2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestAbstractEnum2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestAbstractEnum2?>? [fake_override] declared in .TestAbstractEnum2 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestAbstractEnum2?>? [fake_override] declared in .TestAbstractEnum2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum2>, other:.TestAbstractEnum2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -615,9 +615,9 @@ FILE fqName: fileName:/enumClassModality.kt overridden: public abstract fun foo (): kotlin.Unit declared in .IFoo $this: VALUE_PARAMETER name: type:.IFoo - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum2>) returnType:java.lang.Class<.TestAbstractEnum2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestAbstractEnum2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestAbstractEnum2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestAbstractEnum2>, other:.TestAbstractEnum2) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.txt index 88083e1ee45..e6907a3118b 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.txt @@ -33,9 +33,9 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .A $this: VALUE_PARAMETER name: type:kotlin.Enum<.A> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.A>) returnType:java.lang.Class<.A?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.A>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .A?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.A?>? [fake_override] declared in .A + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .A?>? [fake_override] declared in .A $this: VALUE_PARAMETER name: type:kotlin.Enum<.A> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.A>, other:.A) returnType:kotlin.Int [fake_override,operator] overridden: @@ -184,9 +184,9 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.A> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.A>) returnType:java.lang.Class<.A?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.A>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .A?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.A> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.A>, other:.A) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt index 551f4f79dd7..a2efb51a53a 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt @@ -33,9 +33,9 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test0> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test0>) returnType:java.lang.Class<.Test0?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test0>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test0?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test0> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test0>, other:.Test0) returnType:kotlin.Int [fake_override,operator] overridden: @@ -110,9 +110,9 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test1> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test1>) returnType:java.lang.Class<.Test1?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test1>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test1?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test1> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test1>, other:.Test1) returnType:kotlin.Int [fake_override,operator] overridden: @@ -193,9 +193,9 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .Test2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>) returnType:java.lang.Class<.Test2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.Test2?>? [fake_override] declared in .Test2 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test2?>? [fake_override] declared in .Test2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>, other:.Test2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -259,9 +259,9 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .Test2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>) returnType:java.lang.Class<.Test2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.Test2?>? [fake_override] declared in .Test2 + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test2?>? [fake_override] declared in .Test2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>, other:.Test2) returnType:kotlin.Int [fake_override,operator] overridden: @@ -313,9 +313,9 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>) returnType:java.lang.Class<.Test2?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test2?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test2>, other:.Test2) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.txt index db4f83f3130..9d64b8e39f5 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.txt @@ -81,7 +81,7 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:.IFoo) returnType:kotlin.String [fake_override] overridden: - public open fun foo (): kotlin.String? declared in .JUnrelatedFoo + public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .JUnrelatedFoo public abstract fun foo (): kotlin.String declared in .IFoo $this: VALUE_PARAMETER name: type:.IFoo FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] @@ -100,14 +100,14 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .JUnrelatedFoo' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K4 modality:FINAL visibility:public superTypes:[.JUnrelatedFoo; .IFoo]' - FUN name:foo visibility:public modality:OPEN <> ($this:.K4) returnType:kotlin.String? + FUN name:foo visibility:public modality:OPEN <> ($this:.K4) returnType:@[FlexibleNullability] kotlin.String? overridden: - public open fun foo (): kotlin.String? declared in .JUnrelatedFoo + public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .JUnrelatedFoo public abstract fun foo (): kotlin.String declared in .IFoo $this: VALUE_PARAMETER name: type:.K4 BLOCK_BODY - RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String? declared in .K4' - CALL 'public open fun foo (): kotlin.String? declared in .JUnrelatedFoo' superQualifier='CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:JUnrelatedFoo modality:OPEN visibility:public superTypes:[kotlin.Any]' type=kotlin.String? origin=null + RETURN type=kotlin.Nothing from='public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .K4' + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .JUnrelatedFoo' superQualifier='CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:JUnrelatedFoo modality:OPEN visibility:public superTypes:[kotlin.Any]' type=@[FlexibleNullability] kotlin.String? origin=null $this: GET_VAR ': .K4 declared in .K4.foo' type=.K4 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -267,7 +267,7 @@ FILE fqName: fileName:/implicitNotNullOnDelegatedImplementation.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in .TestK4' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun foo (): kotlin.String? declared in .K4' type=kotlin.String? origin=null + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .K4' type=@[FlexibleNullability] kotlin.String? origin=null $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:.K4 visibility:private [final]' type=.K4 origin=null receiver: GET_VAR ': .TestK4 declared in .TestK4.foo' type=.TestK4 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt index 65487fe6d9b..71bdb74d7f4 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt @@ -143,9 +143,9 @@ FILE fqName: fileName:/classesWithAnnotations.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:java.lang.Class<.TestEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>, other:.TestEnum) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt index 98e6a34603e..9b0ba508d1f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt @@ -72,9 +72,9 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .TestEnum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:java.lang.Class<.TestEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.TestEnum?>? [fake_override] declared in .TestEnum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum?>? [fake_override] declared in .TestEnum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>, other:.TestEnum) returnType:kotlin.Int [fake_override,operator] overridden: @@ -114,9 +114,9 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:java.lang.Class<.TestEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .TestEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.TestEnum>, other:.TestEnum) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt index bff9a395a54..d3363c46cc5 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt @@ -26,9 +26,9 @@ FILE fqName: fileName:/enumsInAnnotationArguments.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.En> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>) returnType:java.lang.Class<.En?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .En?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.En> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>, other:.En) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt index c65b3ef91fd..58cd0a7f74e 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.txt @@ -11,9 +11,9 @@ FILE fqName: fileName:/expectedEnumClass.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:java.lang.Class<.MyEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .MyEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>, other:.MyEnum) returnType:kotlin.Int [fake_override,operator] overridden: @@ -74,9 +74,9 @@ FILE fqName: fileName:/expectedEnumClass.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:java.lang.Class<.MyEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .MyEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>, other:.MyEnum) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt b/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt index d3a63025459..c1d7e815ef0 100644 --- a/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt +++ b/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt @@ -144,5 +144,5 @@ FILE fqName: fileName:/breakContinueInWhen.kt arg0: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null arg1: CONST String type=kotlin.String value="1;2;" then: THROW type=kotlin.Nothing - CONSTRUCTOR_CALL 'public constructor (p0: kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null + CONSTRUCTOR_CALL 'public constructor (p0: @[FlexibleNullability] kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null p0: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.txt index c401823214f..4b90a8e65c6 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.txt @@ -23,33 +23,33 @@ FILE fqName: fileName:/coercionToUnit.kt BLOCK_BODY TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL - VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:java.io.PrintStream? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:@[FlexibleNullability] java.io.PrintStream? [val] + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY WHEN type=kotlin.Unit? origin=null BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_VAR 'val tmp_0: java.io.PrintStream? [val] declared in .test3' type=java.io.PrintStream? origin=null + arg0: GET_VAR 'val tmp_0: @[FlexibleNullability] java.io.PrintStream? [val] declared in .test3' type=@[FlexibleNullability] java.io.PrintStream? origin=null arg1: CONST Null type=kotlin.Nothing? value=null then: CONST Null type=kotlin.Nothing? value=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + then: CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_VAR 'val tmp_0: java.io.PrintStream? [val] declared in .test3' type=java.io.PrintStream? origin=null + GET_VAR 'val tmp_0: @[FlexibleNullability] java.io.PrintStream? [val] declared in .test3' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="Hello," TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL - VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:java.io.PrintStream? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:@[FlexibleNullability] java.io.PrintStream? [val] + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY WHEN type=kotlin.Unit? origin=null BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_VAR 'val tmp_1: java.io.PrintStream? [val] declared in .test3' type=java.io.PrintStream? origin=null + arg0: GET_VAR 'val tmp_1: @[FlexibleNullability] java.io.PrintStream? [val] declared in .test3' type=@[FlexibleNullability] java.io.PrintStream? origin=null arg1: CONST Null type=kotlin.Nothing? value=null then: CONST Null type=kotlin.Nothing? value=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + then: CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_VAR 'val tmp_1: java.io.PrintStream? [val] declared in .test3' type=java.io.PrintStream? origin=null + GET_VAR 'val tmp_1: @[FlexibleNullability] java.io.PrintStream? [val] declared in .test3' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="world!" diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt index 9ccc6e2e734..92af7346834 100644 --- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt +++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.txt @@ -10,11 +10,11 @@ FILE fqName: fileName:/constructorWithOwnTypeParametersCall.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJava (): .J1.J2 declared in ' CONSTRUCTOR_CALL 'public constructor () declared in .J1.J2' type=.J1.J2 origin=null - : kotlin.Double? - : kotlin.CharSequence? + : @[FlexibleNullability] kotlin.Double? + : @[FlexibleNullability] kotlin.CharSequence? $outer: CONSTRUCTOR_CALL 'public constructor () declared in .J1' type=.J1 origin=null - : kotlin.Int? - : kotlin.String? + : @[FlexibleNullability] kotlin.Int? + : @[FlexibleNullability] kotlin.String? CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.K1.K1> TYPE_PARAMETER name:T1 index:0 variance: superTypes:[kotlin.Number] diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt index 00c0340ad19..1e71cf52baa 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt @@ -53,9 +53,9 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .X $this: VALUE_PARAMETER name: type:kotlin.Enum<.X> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.X>) returnType:java.lang.Class<.X?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.X>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .X?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.X?>? [fake_override] declared in .X + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .X?>? [fake_override] declared in .X $this: VALUE_PARAMETER name: type:kotlin.Enum<.X> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.X>, other:.X) returnType:kotlin.Int [fake_override,operator] overridden: @@ -99,9 +99,9 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.X> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.X>) returnType:java.lang.Class<.X?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.X>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .X?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.X> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.X>, other:.X) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt index ec62a79d55a..3e9d0b6e39a 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt @@ -118,9 +118,9 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .MyEnum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:java.lang.Class<.MyEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .MyEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.MyEnum?>? [fake_override] declared in .MyEnum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .MyEnum?>? [fake_override] declared in .MyEnum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>, other:.MyEnum) returnType:kotlin.Int [fake_override,operator] overridden: @@ -160,9 +160,9 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:java.lang.Class<.MyEnum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .MyEnum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyEnum>, other:.MyEnum) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/equals.txt b/compiler/testData/ir/irText/expressions/equals.txt index c0da32f933f..9b22bb36746 100644 --- a/compiler/testData/ir/irText/expressions/equals.txt +++ b/compiler/testData/ir/irText/expressions/equals.txt @@ -19,12 +19,12 @@ FILE fqName: fileName:/equals.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJEqeqNull (): kotlin.Boolean declared in ' CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:kotlin.Int? visibility:public [static]' type=kotlin.Int? origin=GET_PROPERTY + arg0: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=GET_PROPERTY arg1: CONST Null type=kotlin.Nothing? value=null FUN name:testJEqualsNull visibility:public modality:FINAL <> () returnType:kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJEqualsNull (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Int' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:kotlin.Int? visibility:public [static]' type=kotlin.Int? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=GET_PROPERTY other: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt index 48a7778edda..e3610b57853 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt @@ -3,5 +3,5 @@ FILE fqName: fileName:/implicitCastOnPlatformType.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String declared in ' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun getProperty (p0: kotlin.String?): kotlin.String? declared in java.lang.System' type=kotlin.String? origin=null + CALL 'public open fun getProperty (p0: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in java.lang.System' type=@[FlexibleNullability] kotlin.String? origin=null p0: CONST String type=kotlin.String value="test" diff --git a/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.txt b/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.txt index 96a0fbb64fb..f3761d10b8c 100644 --- a/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.txt +++ b/compiler/testData/ir/irText/expressions/implicitNotNullInDestructuringAssignment.txt @@ -12,12 +12,12 @@ FILE fqName: fileName:/implicitNotNullInDestructuringAssignment.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY COMPOSITE type=kotlin.Unit origin=DESTRUCTURING_DECLARATION - VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:.J? [val] - CALL 'public open fun j (): .J? declared in .J' type=.J? origin=null + VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:@[FlexibleNullability] .J? [val] + CALL 'public open fun j (): @[FlexibleNullability] .J? declared in .J' type=@[FlexibleNullability] .J? origin=null VAR name:a type:kotlin.Int [val] CALL 'public final fun component1 (): kotlin.Int [operator] declared in ' type=kotlin.Int origin=COMPONENT_N(index=1) - $receiver: GET_VAR 'val tmp_0: .J? [val] declared in .test' type=.J? origin=null + $receiver: GET_VAR 'val tmp_0: @[FlexibleNullability] .J? [val] declared in .test' type=@[FlexibleNullability] .J? origin=null VAR name:b type:kotlin.Int [val] CALL 'private final fun component2 (): kotlin.Int [operator] declared in ' type=kotlin.Int origin=COMPONENT_N(index=2) $receiver: TYPE_OP type=.J origin=IMPLICIT_NOTNULL typeOperand=.J - GET_VAR 'val tmp_0: .J? [val] declared in .test' type=.J? origin=null + GET_VAR 'val tmp_0: @[FlexibleNullability] .J? [val] declared in .test' type=@[FlexibleNullability] .J? origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt index 941214d83d4..24fb55c9ceb 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt @@ -1,17 +1,17 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt FUN name:testFun visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="testFun" PROPERTY name:testProp visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="testProp/get" RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' CONST Int type=kotlin.Int value=42 @@ -19,9 +19,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Any BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="testProp/set" CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass @@ -36,9 +36,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BRANCH if: CONST Boolean type=kotlin.Boolean value=true then: BLOCK type=kotlin.Int origin=null - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="TestClass/test" CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestClass) returnType:kotlin.Int @@ -50,9 +50,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt receiver: GET_VAR ': .TestClass declared in .TestClass.' type=.TestClass origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY p0: CONST String type=kotlin.String value="TestClass/init" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.txt b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.txt index 78110020039..993d536968a 100644 --- a/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.txt +++ b/compiler/testData/ir/irText/expressions/nullCheckOnGenericLambdaReturn.txt @@ -31,16 +31,16 @@ FILE fqName: fileName:/nullCheckOnGenericLambdaReturn.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun id (x: T of .id): T of .id declared in ' GET_VAR 'x: T of .id declared in .id' type=T of .id origin=null - FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.String? + FUN name:test1 visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.String? declared in ' - CALL 'public final fun checkT (fn: kotlin.Function0.checkT>): T of .checkT declared in ' type=kotlin.String? origin=null - : kotlin.String? - fn: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? + RETURN type=kotlin.Nothing from='public final fun test1 (): @[FlexibleNullability] kotlin.String? declared in ' + CALL 'public final fun checkT (fn: kotlin.Function0.checkT>): T of .checkT declared in ' type=@[FlexibleNullability] kotlin.String? origin=null + : @[FlexibleNullability] kotlin.String? + fn: FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test1' - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in .test1' + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.String declared in ' @@ -52,16 +52,16 @@ FILE fqName: fileName:/nullCheckOnGenericLambdaReturn.kt BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test2' CALL 'public open fun nnFoo (): kotlin.String? declared in .J' type=kotlin.String? origin=null - FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String? + FUN name:test3 visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.String? declared in ' - CALL 'public final fun checkTAny (fn: kotlin.Function0.checkTAny>): T of .checkTAny declared in ' type=kotlin.String? origin=null - : kotlin.String? - fn: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? + RETURN type=kotlin.Nothing from='public final fun test3 (): @[FlexibleNullability] kotlin.String? declared in ' + CALL 'public final fun checkTAny (fn: kotlin.Function0.checkTAny>): T of .checkTAny declared in ' type=@[FlexibleNullability] kotlin.String? origin=null + : @[FlexibleNullability] kotlin.String? + fn: FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test3' - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in .test3' + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test4 (): kotlin.String declared in ' diff --git a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt index d86c495ca2f..f42a497d590 100644 --- a/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt +++ b/compiler/testData/ir/irText/expressions/nullCheckOnLambdaReturn.txt @@ -26,16 +26,16 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Any declared in .test1' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY - FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? + FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test2' + RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in .test2' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY @@ -45,11 +45,11 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0 - FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? + FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test3' - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in .test3' + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY @@ -58,13 +58,13 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt PROPERTY name:test4 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun id (x: T of .id): T of .id declared in ' type=kotlin.Function0 origin=null - : kotlin.Function0 - x: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String? + CALL 'public final fun id (x: T of .id): T of .id declared in ' type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=null + : kotlin.Function0<@[FlexibleNullability] kotlin.String?> + x: FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String? declared in .test4' - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in .test4' + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY @@ -78,7 +78,7 @@ FILE fqName: fileName:/nullCheckOnLambdaReturn.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Any? declared in .test5' - CALL 'public open fun foo (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun foo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:test6 visibility:public modality:FINAL <> () returnType:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test6 (): kotlin.Any? declared in ' diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.txt index 3d1d2bf1e04..e79bcce35ae 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.txt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.txt @@ -36,9 +36,9 @@ FILE fqName: fileName:/objectAsCallable.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.En> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>) returnType:java.lang.Class<.En?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .En?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.En> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>, other:.En) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.txt b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.txt index a0c7ad6ab95..e6ef287c69d 100644 --- a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.txt +++ b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.txt @@ -5,8 +5,8 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt VALUE_PARAMETER name:arr index:2 type:kotlin.Array BLOCK_BODY TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -14,54 +14,54 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit strs: GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null strs: GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null r: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? CONST String type=kotlin.String value="" TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null strs: GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'fn: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=null - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo1 (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null r: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null VAR name:i1 type:.Test [val] - CONSTRUCTOR_CALL 'public constructor (r: java.lang.Runnable?, vararg strs: kotlin.String?) declared in .Test' type=.Test origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CONSTRUCTOR_CALL 'public constructor (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?) declared in .Test' type=.Test origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -69,25 +69,25 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit strs: GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null VAR name:i2 type:.Test [val] - CONSTRUCTOR_CALL 'public constructor (r: java.lang.Runnable?, vararg strs: kotlin.String?) declared in .Test' type=.Test origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CONSTRUCTOR_CALL 'public constructor (r: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?) declared in .Test' type=.Test origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null VAR name:i3 type:.Test [val] - CONSTRUCTOR_CALL 'public constructor (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?) declared in .Test' type=.Test origin=null - r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CONSTRUCTOR_CALL 'public constructor (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?) declared in .Test' type=.Test origin=null + r1: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -95,55 +95,55 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit strs: GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null VAR name:i4 type:.Test [val] - CONSTRUCTOR_CALL 'public constructor (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?) declared in .Test' type=.Test origin=null + CONSTRUCTOR_CALL 'public constructor (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?) declared in .Test' type=.Test origin=null r1: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? CONST String type=kotlin.String value="" VAR name:i5 type:.Test [val] - CONSTRUCTOR_CALL 'public constructor (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?) declared in .Test' type=.Test origin=null - r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CONSTRUCTOR_CALL 'public constructor (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?) declared in .Test' type=.Test origin=null + r1: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null VAR name:i6 type:.Test [val] - CONSTRUCTOR_CALL 'public constructor (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?) declared in .Test' type=.Test origin=null + CONSTRUCTOR_CALL 'public constructor (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?) declared in .Test' type=.Test origin=null r1: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null $this: GET_VAR 'val i1: .Test [val] declared in .test' type=.Test origin=null - r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r1: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -151,45 +151,45 @@ FILE fqName: fileName:/arrayAsVarargAfterSamArgument.kt GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit strs: GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null $this: GET_VAR 'val i1: .Test [val] declared in .test' type=.Test origin=null r1: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? CONST String type=kotlin.String value="" TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null $this: GET_VAR 'val i1: .Test [val] declared in .test' type=.Test origin=null - r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r1: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public open fun foo2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in .Test' type=kotlin.String? origin=null + CALL 'public open fun foo2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?, vararg strs: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .Test' type=@[FlexibleNullability] kotlin.String? origin=null $this: GET_VAR 'val i1: .Test [val] declared in .test' type=.Test origin=null r1: GET_VAR 'r: java.lang.Runnable declared in .test' type=java.lang.Runnable origin=null - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - strs: VARARG type=kotlin.Array? varargElementType=kotlin.String? + strs: VARARG type=@[FlexibleNullability] kotlin.Array? varargElementType=@[FlexibleNullability] kotlin.String? SPREAD_ELEMENT GET_VAR 'arr: kotlin.Array declared in .test' type=kotlin.Array origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.txt b/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.txt index d4ca2d12ed2..f29c72de553 100644 --- a/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.txt +++ b/compiler/testData/ir/irText/expressions/sam/genericSamProjectedOut.txt @@ -2,30 +2,30 @@ FILE fqName: fileName:/genericSamProjectedOut.kt FUN name:test visibility:public modality:FINAL <> (a:example.SomeJavaClass) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:example.SomeJavaClass BLOCK_BODY - CALL 'public open fun someFunction (hello: example.Hello?): kotlin.Unit declared in example.SomeJavaClass' type=kotlin.Unit origin=null + CALL 'public open fun someFunction (hello: @[FlexibleNullability] example.Hello?): kotlin.Unit declared in example.SomeJavaClass' type=kotlin.Unit origin=null $this: GET_VAR 'a: example.SomeJavaClass declared in .test' type=example.SomeJavaClass origin=null - hello: TYPE_OP type=example.Hello? origin=SAM_CONVERSION typeOperand=example.Hello? - FUN_EXPR type=kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.String?) returnType:kotlin.Unit - VALUE_PARAMETER name:it index:0 type:kotlin.String? + hello: TYPE_OP type=@[FlexibleNullability] example.Hello? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] example.Hello? + FUN_EXPR type=kotlin.Function1<@[FlexibleNullability] kotlin.String?, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Unit + VALUE_PARAMETER name:it index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (it: kotlin.String?): kotlin.Unit declared in .test' + RETURN type=kotlin.Nothing from='local final fun (it: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public open fun plus (hello: example.Hello?): kotlin.Unit [operator] declared in example.SomeJavaClass' type=kotlin.Unit origin=PLUS + CALL 'public open fun plus (hello: @[FlexibleNullability] example.Hello?): kotlin.Unit [operator] declared in example.SomeJavaClass' type=kotlin.Unit origin=PLUS $this: GET_VAR 'a: example.SomeJavaClass declared in .test' type=example.SomeJavaClass origin=null - hello: TYPE_OP type=example.Hello? origin=SAM_CONVERSION typeOperand=example.Hello? - FUN_EXPR type=kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.String?) returnType:kotlin.Unit - VALUE_PARAMETER name:it index:0 type:kotlin.String? + hello: TYPE_OP type=@[FlexibleNullability] example.Hello? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] example.Hello? + FUN_EXPR type=kotlin.Function1<@[FlexibleNullability] kotlin.String?, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Unit + VALUE_PARAMETER name:it index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (it: kotlin.String?): kotlin.Unit declared in .test' + RETURN type=kotlin.Nothing from='local final fun (it: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public open fun get (hello: example.Hello?): kotlin.Unit [operator] declared in example.SomeJavaClass' type=kotlin.Unit origin=GET_ARRAY_ELEMENT + CALL 'public open fun get (hello: @[FlexibleNullability] example.Hello?): kotlin.Unit [operator] declared in example.SomeJavaClass' type=kotlin.Unit origin=GET_ARRAY_ELEMENT $this: GET_VAR 'a: example.SomeJavaClass declared in .test' type=example.SomeJavaClass origin=null - hello: TYPE_OP type=example.Hello? origin=SAM_CONVERSION typeOperand=example.Hello? - FUN_EXPR type=kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.String?) returnType:kotlin.Unit - VALUE_PARAMETER name:it index:0 type:kotlin.String? + hello: TYPE_OP type=@[FlexibleNullability] example.Hello? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] example.Hello? + FUN_EXPR type=kotlin.Function1<@[FlexibleNullability] kotlin.String?, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Unit + VALUE_PARAMETER name:it index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (it: kotlin.String?): kotlin.Unit declared in .test' + RETURN type=kotlin.Nothing from='local final fun (it: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in .test' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit diff --git a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt index 53df6b2d2b9..5becc05a0c2 100644 --- a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt +++ b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.txt @@ -1,11 +1,11 @@ FILE fqName: fileName:/samByProjectedType.kt FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun bar (j: .J<*>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null - j: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? - FUN_EXPR type=kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any? + CALL 'public open fun bar (j: @[FlexibleNullability] .J<*>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + j: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.Any?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.Any?>? + FUN_EXPR type=kotlin.Function1 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.Any) returnType:@[FlexibleNullability] kotlin.Any? VALUE_PARAMETER name:x index:0 type:kotlin.Any BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (x: kotlin.Any): kotlin.Any? declared in .test1' + RETURN type=kotlin.Nothing from='local final fun (x: kotlin.Any): @[FlexibleNullability] kotlin.Any? declared in .test1' GET_VAR 'x: kotlin.Any declared in .test1.' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConstructors.txt b/compiler/testData/ir/irText/expressions/sam/samConstructors.txt index 099fe672dab..7426c95c026 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConstructors.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConstructors.txt @@ -25,14 +25,14 @@ FILE fqName: fileName:/samConstructors.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test4 (): java.util.Comparator declared in ' TYPE_OP type=java.util.Comparator origin=SAM_CONVERSION typeOperand=java.util.Comparator - FUN_EXPR type=kotlin.Function2 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (a:kotlin.Int?, b:kotlin.Int?) returnType:kotlin.Int - VALUE_PARAMETER name:a index:0 type:kotlin.Int? - VALUE_PARAMETER name:b index:1 type:kotlin.Int? + FUN_EXPR type=kotlin.Function2<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.Int?, kotlin.Int> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (a:@[FlexibleNullability] kotlin.Int?, b:@[FlexibleNullability] kotlin.Int?) returnType:kotlin.Int + VALUE_PARAMETER name:a index:0 type:@[FlexibleNullability] kotlin.Int? + VALUE_PARAMETER name:b index:1 type:@[FlexibleNullability] kotlin.Int? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (a: kotlin.Int?, b: kotlin.Int?): kotlin.Int declared in .test4' + RETURN type=kotlin.Nothing from='local final fun (a: @[FlexibleNullability] kotlin.Int?, b: @[FlexibleNullability] kotlin.Int?): kotlin.Int declared in .test4' CALL 'public final fun minus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=MINUS $this: TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int - GET_VAR 'a: kotlin.Int? declared in .test4.' type=kotlin.Int? origin=null + GET_VAR 'a: @[FlexibleNullability] kotlin.Int? declared in .test4.' type=@[FlexibleNullability] kotlin.Int? origin=null other: TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int - GET_VAR 'b: kotlin.Int? declared in .test4.' type=kotlin.Int? origin=null + GET_VAR 'b: @[FlexibleNullability] kotlin.Int? declared in .test4.' type=@[FlexibleNullability] kotlin.Int? origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.txt index 562f0dcd066..48c9baad066 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.txt @@ -1,11 +1,11 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall.kt - FUN name:test1 visibility:public modality:FINAL <> (f:kotlin.Function1) returnType:.C + FUN name:test1 visibility:public modality:FINAL <> (f:kotlin.Function1) returnType:.C<@[FlexibleNullability] kotlin.String?> VALUE_PARAMETER name:f index:0 type:kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (f: kotlin.Function1): .C declared in ' - CONSTRUCTOR_CALL 'public constructor (jxx: .J.C?, X of .C?>?) declared in .C' type=.C origin=null - : kotlin.String? - jxx: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? + RETURN type=kotlin.Nothing from='public final fun test1 (f: kotlin.Function1): .C<@[FlexibleNullability] kotlin.String?> declared in ' + CONSTRUCTOR_CALL 'public constructor (jxx: @[FlexibleNullability] .J.C?, X of .C?>?) declared in .C' type=.C<@[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.String? + jxx: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?>? GET_VAR 'f: kotlin.Function1 declared in .test1' type=kotlin.Function1 origin=null FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Unit VALUE_PARAMETER name:x index:0 type:kotlin.Any @@ -14,8 +14,8 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall.kt TYPE_OP type=kotlin.Function1 origin=CAST typeOperand=kotlin.Function1 GET_VAR 'x: kotlin.Any declared in .test2' type=kotlin.Any origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CONSTRUCTOR_CALL 'public constructor (jxx: .J.C?, X of .C?>?) declared in .C' type=.C origin=null - : kotlin.String? - jxx: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? - TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.String?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.String?> + CONSTRUCTOR_CALL 'public constructor (jxx: @[FlexibleNullability] .J.C?, X of .C?>?) declared in .C' type=.C<@[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.String? + jxx: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?>? + TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> GET_VAR 'x: kotlin.Any declared in .test2' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt index 85358ed52c7..9d039e521eb 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt @@ -1,16 +1,16 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt - FUN name:test3 visibility:public modality:FINAL <> (f1:kotlin.Function1, f2:kotlin.Function1) returnType:.C.D + FUN name:test3 visibility:public modality:FINAL <> (f1:kotlin.Function1, f2:kotlin.Function1) returnType:.C.D<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?> VALUE_PARAMETER name:f1 index:0 type:kotlin.Function1 VALUE_PARAMETER name:f2 index:1 type:kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test3 (f1: kotlin.Function1, f2: kotlin.Function1): .C.D declared in ' - CONSTRUCTOR_CALL 'public constructor (jxy: .J.C?, Y of .C.D?>?) declared in .C.D' type=.C.D origin=null - : kotlin.Int? - $outer: CONSTRUCTOR_CALL 'public constructor (jxx: .J.C?, X of .C?>?) declared in .C' type=.C origin=null - : kotlin.String? - jxx: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? + RETURN type=kotlin.Nothing from='public final fun test3 (f1: kotlin.Function1, f2: kotlin.Function1): .C.D<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?> declared in ' + CONSTRUCTOR_CALL 'public constructor (jxy: @[FlexibleNullability] .J.C?, Y of .C.D?>?) declared in .C.D' type=.C.D<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.Int? + $outer: CONSTRUCTOR_CALL 'public constructor (jxx: @[FlexibleNullability] .J.C?, X of .C?>?) declared in .C' type=.C<@[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.String? + jxx: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?>? GET_VAR 'f1: kotlin.Function1 declared in .test3' type=kotlin.Function1 origin=null - jxy: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? + jxy: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.Int?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.Int?>? GET_VAR 'f2: kotlin.Function1 declared in .test3' type=kotlin.Function1 origin=null CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Outer.Outer> @@ -77,27 +77,27 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:test4 visibility:public modality:FINAL <> (f:kotlin.Function1, g:kotlin.Function1) returnType:.Outer.Inner + FUN name:test4 visibility:public modality:FINAL <> (f:kotlin.Function1, g:kotlin.Function1) returnType:.Outer.Inner<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.String?> VALUE_PARAMETER name:f index:0 type:kotlin.Function1 VALUE_PARAMETER name:g index:1 type:kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test4 (f: kotlin.Function1, g: kotlin.Function1): .Outer.Inner declared in ' - CONSTRUCTOR_CALL 'public constructor (j12: .J.Outer, T2 of .Outer.Inner>) [primary] declared in .Outer.Inner' type=.Outer.Inner origin=null - : kotlin.Any? - $outer: CONSTRUCTOR_CALL 'public constructor (j11: .J.Outer, T1 of .Outer>) [primary] declared in .Outer' type=.Outer origin=null - : kotlin.String? - j11: TYPE_OP type=.J origin=SAM_CONVERSION typeOperand=.J + RETURN type=kotlin.Nothing from='public final fun test4 (f: kotlin.Function1, g: kotlin.Function1): .Outer.Inner<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.String?> declared in ' + CONSTRUCTOR_CALL 'public constructor (j12: .J.Outer, T2 of .Outer.Inner>) [primary] declared in .Outer.Inner' type=.Outer.Inner<@[FlexibleNullability] kotlin.Any?, @[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.Any? + $outer: CONSTRUCTOR_CALL 'public constructor (j11: .J.Outer, T1 of .Outer>) [primary] declared in .Outer' type=.Outer<@[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.String? + j11: TYPE_OP type=.J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=SAM_CONVERSION typeOperand=.J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> GET_VAR 'f: kotlin.Function1 declared in .test4' type=kotlin.Function1 origin=null - j12: TYPE_OP type=.J origin=SAM_CONVERSION typeOperand=.J + j12: TYPE_OP type=.J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.Any?> origin=SAM_CONVERSION typeOperand=.J<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.Any?> GET_VAR 'g: kotlin.Function1 declared in .test4' type=kotlin.Function1 origin=null - FUN name:testGenericJavaCtor1 visibility:public modality:FINAL <> (f:kotlin.Function1) returnType:.G + FUN name:testGenericJavaCtor1 visibility:public modality:FINAL <> (f:kotlin.Function1) returnType:.G<@[FlexibleNullability] kotlin.String?> VALUE_PARAMETER name:f index:0 type:kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun testGenericJavaCtor1 (f: kotlin.Function1): .G declared in ' - CONSTRUCTOR_CALL 'public constructor (x: .J.G.?, TClass of .G?>?) declared in .G' type=.G origin=null - : kotlin.String? - : kotlin.Int? - x: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? + RETURN type=kotlin.Nothing from='public final fun testGenericJavaCtor1 (f: kotlin.Function1): .G<@[FlexibleNullability] kotlin.String?> declared in ' + CONSTRUCTOR_CALL 'public constructor (x: @[FlexibleNullability] .J.G.?, TClass of .G?>?) declared in .G' type=.G<@[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.String? + : @[FlexibleNullability] kotlin.Int? + x: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?>? GET_VAR 'f: kotlin.Function1 declared in .testGenericJavaCtor1' type=kotlin.Function1 origin=null FUN name:testGenericJavaCtor2 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Unit VALUE_PARAMETER name:x index:0 type:kotlin.Any @@ -106,9 +106,9 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt TYPE_OP type=kotlin.Function1 origin=CAST typeOperand=kotlin.Function1 GET_VAR 'x: kotlin.Any declared in .testGenericJavaCtor2' type=kotlin.Any origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CONSTRUCTOR_CALL 'public constructor (x: .J.G.?, TClass of .G?>?) declared in .G' type=.G origin=null - : kotlin.String? - : kotlin.Int? - x: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? - TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.Int?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.Int?> + CONSTRUCTOR_CALL 'public constructor (x: @[FlexibleNullability] .J.G.?, TClass of .G?>?) declared in .G' type=.G<@[FlexibleNullability] kotlin.String?> origin=null + : @[FlexibleNullability] kotlin.String? + : @[FlexibleNullability] kotlin.Int? + x: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.Int?, @[FlexibleNullability] kotlin.String?>? + TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.Int?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.Int?> GET_VAR 'x: kotlin.Any declared in .testGenericJavaCtor2' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt index bbc14df432a..76f114dc297 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.txt @@ -3,33 +3,33 @@ FILE fqName: fileName:/samConversionToGeneric.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1 (): .J declared in ' TYPE_OP type=.J origin=SAM_CONVERSION typeOperand=.J - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.String?> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.String?) returnType:kotlin.String? - VALUE_PARAMETER name:x index:0 type:kotlin.String? + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:@[FlexibleNullability] kotlin.String?) returnType:@[FlexibleNullability] kotlin.String? + VALUE_PARAMETER name:x index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (x: kotlin.String?): kotlin.String? declared in .test1' - GET_VAR 'x: kotlin.String? declared in .test1.' type=kotlin.String? origin=null - FUN name:test2 visibility:public modality:FINAL <> () returnType:.J + RETURN type=kotlin.Nothing from='local final fun (x: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] kotlin.String? declared in .test1' + GET_VAR 'x: @[FlexibleNullability] kotlin.String? declared in .test1.' type=@[FlexibleNullability] kotlin.String? origin=null + FUN name:test2 visibility:public modality:FINAL <> () returnType:.J<@[FlexibleNullability] kotlin.String?> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test2 (): .J declared in ' - TYPE_OP type=.J origin=SAM_CONVERSION typeOperand=.J - FUN_EXPR type=kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String? + RETURN type=kotlin.Nothing from='public final fun test2 (): .J<@[FlexibleNullability] kotlin.String?> declared in ' + TYPE_OP type=.J<@[FlexibleNullability] kotlin.String?> origin=SAM_CONVERSION typeOperand=.J<@[FlexibleNullability] kotlin.String?> + FUN_EXPR type=kotlin.Function1 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.String) returnType:@[FlexibleNullability] kotlin.String? VALUE_PARAMETER name:x index:0 type:kotlin.String BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (x: kotlin.String): kotlin.String? declared in .test2' + RETURN type=kotlin.Nothing from='local final fun (x: kotlin.String): @[FlexibleNullability] kotlin.String? declared in .test2' GET_VAR 'x: kotlin.String declared in .test2.' type=kotlin.String origin=null FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.Unit declared in ' - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null - : kotlin.String? - j: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? - FUN_EXPR type=kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.String) returnType:kotlin.String? + CALL 'public open fun bar (j: @[FlexibleNullability] .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + : @[FlexibleNullability] kotlin.String? + j: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?>? + FUN_EXPR type=kotlin.Function1 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:kotlin.String) returnType:@[FlexibleNullability] kotlin.String? VALUE_PARAMETER name:x index:0 type:kotlin.String BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (x: kotlin.String): kotlin.String? declared in .test3' + RETURN type=kotlin.Nothing from='local final fun (x: kotlin.String): @[FlexibleNullability] kotlin.String? declared in .test3' GET_VAR 'x: kotlin.String declared in .test3.' type=kotlin.String origin=null FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:kotlin.Any @@ -37,9 +37,9 @@ FILE fqName: fileName:/samConversionToGeneric.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit TYPE_OP type=.J origin=CAST typeOperand=.J GET_VAR 'a: kotlin.Any declared in .test4' type=kotlin.Any origin=null - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null - : kotlin.String? - j: TYPE_OP type=.J origin=IMPLICIT_CAST typeOperand=.J + CALL 'public open fun bar (j: @[FlexibleNullability] .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + : @[FlexibleNullability] kotlin.String? + j: TYPE_OP type=.J<@[FlexibleNullability] kotlin.String?> origin=IMPLICIT_CAST typeOperand=.J<@[FlexibleNullability] kotlin.String?> GET_VAR 'a: kotlin.Any declared in .test4' type=kotlin.Any origin=null FUN name:test5 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:kotlin.Any @@ -47,18 +47,18 @@ FILE fqName: fileName:/samConversionToGeneric.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit TYPE_OP type=kotlin.Function1 origin=CAST typeOperand=kotlin.Function1 GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null - : kotlin.String? - j: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? - TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.String?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String?, kotlin.String?> + CALL 'public open fun bar (j: @[FlexibleNullability] .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + : @[FlexibleNullability] kotlin.String? + j: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?>? + TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null FUN name:test6 visibility:public modality:FINAL (a:kotlin.Function1.test6, T of .test6>) returnType:kotlin.Unit TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] VALUE_PARAMETER name:a index:0 type:kotlin.Function1.test6, T of .test6> BLOCK_BODY - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: @[FlexibleNullability] .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : T of .test6? - j: TYPE_OP type=.J.test6?>? origin=SAM_CONVERSION typeOperand=.J.test6?>? + j: TYPE_OP type=@[FlexibleNullability] .J.test6?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J.test6?>? GET_VAR 'a: kotlin.Function1.test6, T of .test6> declared in .test6' type=kotlin.Function1.test6, T of .test6> origin=null FUN name:test7 visibility:public modality:FINAL (a:kotlin.Any) returnType:kotlin.Unit TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] @@ -67,28 +67,28 @@ FILE fqName: fileName:/samConversionToGeneric.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit TYPE_OP type=kotlin.Function1.test7, T of .test7> origin=CAST typeOperand=kotlin.Function1.test7, T of .test7> GET_VAR 'a: kotlin.Any declared in .test7' type=kotlin.Any origin=null - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + CALL 'public open fun bar (j: @[FlexibleNullability] .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null : T of .test7? - j: TYPE_OP type=.J.test7?>? origin=SAM_CONVERSION typeOperand=.J.test7?>? + j: TYPE_OP type=@[FlexibleNullability] .J.test7?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J.test7?>? TYPE_OP type=kotlin.Function1<@[ParameterName(name = 'x')] T of .test7?, T of .test7?> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<@[ParameterName(name = 'x')] T of .test7?, T of .test7?> GET_VAR 'a: kotlin.Any declared in .test7' type=kotlin.Any origin=null - FUN name:test8 visibility:public modality:FINAL <> (efn:@[ExtensionFunctionType] kotlin.Function1) returnType:.J + FUN name:test8 visibility:public modality:FINAL <> (efn:@[ExtensionFunctionType] kotlin.Function1) returnType:.J<@[FlexibleNullability] kotlin.String?> VALUE_PARAMETER name:efn index:0 type:@[ExtensionFunctionType] kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test8 (efn: @[ExtensionFunctionType] kotlin.Function1): .J declared in ' - TYPE_OP type=.J origin=SAM_CONVERSION typeOperand=.J + RETURN type=kotlin.Nothing from='public final fun test8 (efn: @[ExtensionFunctionType] kotlin.Function1): .J<@[FlexibleNullability] kotlin.String?> declared in ' + TYPE_OP type=.J<@[FlexibleNullability] kotlin.String?> origin=SAM_CONVERSION typeOperand=.J<@[FlexibleNullability] kotlin.String?> GET_VAR 'efn: @[ExtensionFunctionType] kotlin.Function1 declared in .test8' type=@[ExtensionFunctionType] kotlin.Function1 origin=null FUN name:test9 visibility:public modality:FINAL <> (efn:@[ExtensionFunctionType] kotlin.Function1) returnType:kotlin.Unit VALUE_PARAMETER name:efn index:0 type:@[ExtensionFunctionType] kotlin.Function1 BLOCK_BODY - CALL 'public open fun bar (j: .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null - : kotlin.String? - j: TYPE_OP type=.J? origin=SAM_CONVERSION typeOperand=.J? + CALL 'public open fun bar (j: @[FlexibleNullability] .J.H.bar?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + : @[FlexibleNullability] kotlin.String? + j: TYPE_OP type=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J<@[FlexibleNullability] kotlin.String?>? GET_VAR 'efn: @[ExtensionFunctionType] kotlin.Function1 declared in .test9' type=@[ExtensionFunctionType] kotlin.Function1 origin=null FUN name:test10 visibility:public modality:FINAL <> (fn:kotlin.Function1) returnType:kotlin.Unit VALUE_PARAMETER name:fn index:0 type:kotlin.Function1 BLOCK_BODY - CALL 'public open fun bar2x (j2x: .J2X.H.bar2x?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null - : kotlin.Int? - j2x: TYPE_OP type=.J2X? origin=SAM_CONVERSION typeOperand=.J2X? + CALL 'public open fun bar2x (j2x: @[FlexibleNullability] .J2X.H.bar2x?>?): kotlin.Unit declared in .H' type=kotlin.Unit origin=null + : @[FlexibleNullability] kotlin.Int? + j2x: TYPE_OP type=@[FlexibleNullability] .J2X<@[FlexibleNullability] kotlin.Int?>? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .J2X<@[FlexibleNullability] kotlin.Int?>? GET_VAR 'fn: kotlin.Function1 declared in .test10' type=kotlin.Function1 origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt new file mode 100644 index 00000000000..f73745b3804 --- /dev/null +++ b/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt @@ -0,0 +1,54 @@ +FILE fqName: fileName:/samConversions.kt + FUN name:test0 visibility:public modality:FINAL <> ($receiver:.J, a:java.lang.Runnable) returnType:kotlin.Unit + $receiver: VALUE_PARAMETER name: type:.J + VALUE_PARAMETER name:a index:0 type:java.lang.Runnable + BLOCK_BODY + CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + r: GET_VAR 'a: java.lang.Runnable declared in .test0' type=java.lang.Runnable origin=null + CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + $this: GET_VAR ': .J declared in .test0' type=.J origin=null + r: GET_VAR 'a: java.lang.Runnable declared in .test0' type=java.lang.Runnable origin=null + FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit + BLOCK_BODY + CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + FUN_EXPR type=kotlin.Function0 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit + BLOCK_BODY + CALL 'public final fun test1 (): kotlin.Unit declared in ' type=kotlin.Unit origin=null + FUN name:test2 visibility:public modality:FINAL <> ($receiver:.J) returnType:kotlin.Unit + $receiver: VALUE_PARAMETER name: type:.J + BLOCK_BODY + CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + $this: GET_VAR ': .J declared in .test2' type=.J origin=null + r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + FUN_EXPR type=kotlin.Function0 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit + BLOCK_BODY + CALL 'public final fun test1 (): kotlin.Unit declared in ' type=kotlin.Unit origin=null + FUN name:test3 visibility:public modality:FINAL <> ($receiver:.J, a:kotlin.Function0) returnType:kotlin.Unit + $receiver: VALUE_PARAMETER name: type:.J + VALUE_PARAMETER name:a index:0 type:kotlin.Function0 + BLOCK_BODY + CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + $this: GET_VAR ': .J declared in .test3' type=.J origin=null + r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null + r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null + FUN name:test4 visibility:public modality:FINAL <> ($receiver:.J, a:kotlin.Function0, b:kotlin.Function0, flag:kotlin.Boolean) returnType:kotlin.Unit + $receiver: VALUE_PARAMETER name: type:.J + VALUE_PARAMETER name:a index:0 type:kotlin.Function0 + VALUE_PARAMETER name:b index:1 type:kotlin.Function0 + VALUE_PARAMETER name:flag index:2 type:kotlin.Boolean + BLOCK_BODY + CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + $this: GET_VAR ': .J declared in .test4' type=.J origin=null + r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + WHEN type=kotlin.Function0 origin=IF + BRANCH + if: GET_VAR 'flag: kotlin.Boolean declared in .test4' type=kotlin.Boolean origin=null + then: GET_VAR 'a: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null + BRANCH + if: CONST Boolean type=kotlin.Boolean value=true + then: GET_VAR 'b: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversions.kt b/compiler/testData/ir/irText/expressions/sam/samConversions.kt index e9272601009..c8420db8188 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversions.kt +++ b/compiler/testData/ir/irText/expressions/sam/samConversions.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL // WITH_JDK // FILE: samConversions.kt fun J.test0(a: Runnable) { diff --git a/compiler/testData/ir/irText/expressions/sam/samConversions.txt b/compiler/testData/ir/irText/expressions/sam/samConversions.txt index f73745b3804..63dc442aab9 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversions.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversions.txt @@ -3,15 +3,15 @@ FILE fqName: fileName:/samConversions.kt $receiver: VALUE_PARAMETER name: type:.J VALUE_PARAMETER name:a index:0 type:java.lang.Runnable BLOCK_BODY - CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runStatic (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null r: GET_VAR 'a: java.lang.Runnable declared in .test0' type=java.lang.Runnable origin=null - CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runIt (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test0' type=.J origin=null r: GET_VAR 'a: java.lang.Runnable declared in .test0' type=java.lang.Runnable origin=null FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + CALL 'public open fun runStatic (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -19,9 +19,9 @@ FILE fqName: fileName:/samConversions.kt FUN name:test2 visibility:public modality:FINAL <> ($receiver:.J) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.J BLOCK_BODY - CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runIt (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test2' type=.J origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -30,11 +30,11 @@ FILE fqName: fileName:/samConversions.kt $receiver: VALUE_PARAMETER name: type:.J VALUE_PARAMETER name:a index:0 type:kotlin.Function0 BLOCK_BODY - CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test3' type=.J origin=null - r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r1: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null FUN name:test4 visibility:public modality:FINAL <> ($receiver:.J, a:kotlin.Function0, b:kotlin.Function0, flag:kotlin.Boolean) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.J @@ -42,9 +42,9 @@ FILE fqName: fileName:/samConversions.kt VALUE_PARAMETER name:b index:1 type:kotlin.Function0 VALUE_PARAMETER name:flag index:2 type:kotlin.Boolean BLOCK_BODY - CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runIt (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: GET_VAR ': .J declared in .test4' type=.J origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? WHEN type=kotlin.Function0 origin=IF BRANCH if: GET_VAR 'flag: kotlin.Boolean declared in .test4' type=kotlin.Boolean origin=null diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.txt b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.txt index 864ad89e6b5..10ded19126e 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test1' type=kotlin.Function0 origin=null then: BLOCK type=kotlin.Unit origin=null - CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun runStatic (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test1' type=kotlin.Function0 origin=null FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit @@ -18,7 +18,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test2' type=kotlin.Function0 origin=null then: BLOCK type=kotlin.Unit origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test2' type=kotlin.Function0 origin=null @@ -30,7 +30,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null then: BLOCK type=kotlin.Unit origin=null - CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r1: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test3' type=kotlin.Function0 origin=null @@ -45,11 +45,11 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null then: BLOCK type=kotlin.Unit origin=null - CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run2 (r1: @[FlexibleNullability] java.lang.Runnable?, r2: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null - r1: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r1: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'a: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null - r2: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r2: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? GET_VAR 'b: kotlin.Function0 declared in .test4' type=kotlin.Function0 origin=null FUN name:test5 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:kotlin.Any @@ -59,7 +59,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null then: BLOCK type=kotlin.Unit origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5' type=kotlin.Any origin=null @@ -74,7 +74,7 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Any declared in .test5x' type=kotlin.Any origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null r: TYPE_OP type=java.lang.Runnable origin=IMPLICIT_CAST typeOperand=java.lang.Runnable GET_VAR 'a: kotlin.Any declared in .test5x' type=kotlin.Any origin=null @@ -84,9 +84,9 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Any declared in .test6' type=kotlin.Any origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? TYPE_OP type=kotlin.Function0 origin=IMPLICIT_CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Any declared in .test6' type=kotlin.Any origin=null FUN name:test7 visibility:public modality:FINAL <> (a:kotlin.Function1) returnType:kotlin.Unit @@ -95,24 +95,24 @@ FILE fqName: fileName:/samConversionsWithSmartCasts.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Function1 declared in .test7' type=kotlin.Function1 origin=null - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? TYPE_OP type=kotlin.Function0 origin=IMPLICIT_CAST typeOperand=kotlin.Function0 GET_VAR 'a: kotlin.Function1 declared in .test7' type=kotlin.Function1 origin=null FUN name:test8 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:kotlin.Function0 BLOCK_BODY - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? TYPE_OP type=kotlin.Function0 origin=IMPLICIT_NOTNULL typeOperand=kotlin.Function0 - CALL 'public open fun id (x: T of .J.id?): T of .J.id? declared in .J' type=kotlin.Function0? origin=null - : kotlin.Function0? + CALL 'public open fun id (x: T of .J.id?): T of .J.id? declared in .J' type=@[FlexibleNullability] kotlin.Function0? origin=null + : @[FlexibleNullability] kotlin.Function0? x: GET_VAR 'a: kotlin.Function0 declared in .test8' type=kotlin.Function0 origin=null FUN name:test9 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null + CALL 'public open fun run1 (r: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' type=.J origin=null - r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + r: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun test9 (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= diff --git a/compiler/testData/ir/irText/expressions/sam/samOperators.txt b/compiler/testData/ir/irText/expressions/sam/samOperators.txt index f6a453d0a4c..5c538757543 100644 --- a/compiler/testData/ir/irText/expressions/sam/samOperators.txt +++ b/compiler/testData/ir/irText/expressions/sam/samOperators.txt @@ -4,41 +4,41 @@ FILE fqName: fileName:/samOperators.kt FUN name:test1 visibility:public modality:FINAL <> ($receiver:.J) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.J BLOCK_BODY - CALL 'public open fun get (k: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=GET_ARRAY_ELEMENT + CALL 'public open fun get (k: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=GET_ARRAY_ELEMENT $this: GET_VAR ': .J declared in .test1' type=.J origin=null - k: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + k: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - CALL 'public open fun get (k: java.lang.Runnable?, m: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=GET_ARRAY_ELEMENT + CALL 'public open fun get (k: @[FlexibleNullability] java.lang.Runnable?, m: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=GET_ARRAY_ELEMENT $this: GET_VAR ': .J declared in .test1' type=.J origin=null - k: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + k: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - m: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + m: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= FUN name:test2 visibility:public modality:FINAL <> ($receiver:.J) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.J BLOCK_BODY - CALL 'public open fun set (k: java.lang.Runnable?, v: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=EQ + CALL 'public open fun set (k: @[FlexibleNullability] java.lang.Runnable?, v: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=EQ $this: GET_VAR ': .J declared in .test2' type=.J origin=null - k: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + k: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - v: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + v: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - CALL 'public open fun set (k: java.lang.Runnable?, m: java.lang.Runnable?, v: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=EQ + CALL 'public open fun set (k: @[FlexibleNullability] java.lang.Runnable?, m: @[FlexibleNullability] java.lang.Runnable?, v: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=EQ $this: GET_VAR ': .J declared in .test2' type=.J origin=null - k: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + k: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - m: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + m: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - v: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + v: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= FUN name:test3 visibility:public modality:FINAL <> ($receiver:.J) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.J BLOCK_BODY - CALL 'public open fun plusAssign (i: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=PLUSEQ + CALL 'public open fun plusAssign (i: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=PLUSEQ $this: GET_VAR ': .J declared in .test3' type=.J origin=PLUSEQ - i: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + i: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - CALL 'public open fun minusAssign (i: java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=MINUSEQ + CALL 'public open fun minusAssign (i: @[FlexibleNullability] java.lang.Runnable?): kotlin.Unit [operator] declared in .J' type=kotlin.Unit origin=MINUSEQ $this: GET_VAR ': .J declared in .test3' type=.J origin=MINUSEQ - i: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable? + i: TYPE_OP type=@[FlexibleNullability] java.lang.Runnable? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] java.lang.Runnable? FUNCTION_REFERENCE 'public final fun f (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt index ebd92f26f4f..f668b7287ad 100644 --- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt +++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/Derived.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String GET_VAR 'v: kotlin.Any declared in .Derived.setValue' type=kotlin.Any origin=null then: BLOCK type=kotlin.Unit origin=null - SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:@[FlexibleNullability] kotlin.String? visibility:public' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .Derived declared in .Derived.setValue' type=.Derived origin=null value: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String GET_VAR 'v: kotlin.Any declared in .Derived.setValue' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt index fa90fef9b08..af224523958 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt @@ -51,9 +51,9 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.En> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>) returnType:java.lang.Class<.En?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .En?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.En> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.En>, other:.En) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/values.txt b/compiler/testData/ir/irText/expressions/values.txt index f3a3e2c02e4..0a6d5a84f61 100644 --- a/compiler/testData/ir/irText/expressions/values.txt +++ b/compiler/testData/ir/irText/expressions/values.txt @@ -17,9 +17,9 @@ FILE fqName: fileName:/values.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Enum> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Enum>) returnType:java.lang.Class<.Enum?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Enum>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Enum?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Enum> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Enum>, other:.Enum) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.txt b/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.txt index 3440c4866a3..a208a64723b 100644 --- a/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.txt +++ b/compiler/testData/ir/irText/regressions/typeParametersInImplicitCast.txt @@ -14,6 +14,6 @@ FILE fqName: fileName:/typeParametersInImplicitCast.kt BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (it: kotlin.collections.List.problematic>): kotlin.collections.List.problematic?>? declared in .problematic' TYPE_OP type=kotlin.collections.List.problematic?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List.problematic?> - CALL 'public/*package*/ open fun id (v: kotlin.collections.List.ListId.id?>?): kotlin.collections.List.ListId.id?>? declared in .ListId' type=kotlin.collections.List.problematic?>? origin=null + CALL 'public/*package*/ open fun id (v: @[FlexibleNullability] kotlin.collections.List.ListId.id?>?): kotlin.collections.List.ListId.id?>? declared in .ListId' type=kotlin.collections.List.problematic?>? origin=null : T of .problematic? v: GET_VAR 'it: kotlin.collections.List.problematic> declared in .problematic.' type=kotlin.collections.List.problematic> origin=null diff --git a/compiler/testData/ir/irText/singletons/enumEntry.txt b/compiler/testData/ir/irText/singletons/enumEntry.txt index 6993ecccf34..3a4c144537e 100644 --- a/compiler/testData/ir/irText/singletons/enumEntry.txt +++ b/compiler/testData/ir/irText/singletons/enumEntry.txt @@ -52,9 +52,9 @@ FILE fqName: fileName:/enumEntry.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit [fake_override] declared in .Z $this: VALUE_PARAMETER name: type:kotlin.Enum<.Z> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Z>) returnType:java.lang.Class<.Z?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Z>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Z?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class<.Z?>? [fake_override] declared in .Z + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Z?>? [fake_override] declared in .Z $this: VALUE_PARAMETER name: type:kotlin.Enum<.Z> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Z>, other:.Z) returnType:kotlin.Int [fake_override,operator] overridden: @@ -94,9 +94,9 @@ FILE fqName: fileName:/enumEntry.kt overridden: protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Z> - FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Z>) returnType:java.lang.Class<.Z?>? [fake_override] + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Z>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Z?>? [fake_override] overridden: - public final fun getDeclaringClass (): java.lang.Class? declared in kotlin.Enum + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.Z> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Z>, other:.Z) returnType:kotlin.Int [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/stubs/builtinMap.txt b/compiler/testData/ir/irText/stubs/builtinMap.txt index 009afa05a51..c9b73033d24 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap.txt @@ -18,7 +18,7 @@ FILE fqName: fileName:/builtinMap.kt if: CONST Boolean type=kotlin.Boolean value=true then: CALL 'public final fun apply (block: @[ExtensionFunctionType] kotlin.Function1): T of kotlin.apply [inline] declared in kotlin' type=java.util.LinkedHashMap.plus?, V1 of .plus?>{ kotlin.collections.LinkedHashMap.plus?, V1 of .plus?> } origin=null : java.util.LinkedHashMap.plus?, V1 of .plus?>{ kotlin.collections.LinkedHashMap.plus?, V1 of .plus?> } - $receiver: CONSTRUCTOR_CALL 'public constructor (p0: kotlin.collections.Map?) declared in java.util.LinkedHashMap' type=java.util.LinkedHashMap.plus?, V1 of .plus?> origin=null + $receiver: CONSTRUCTOR_CALL 'public constructor (p0: @[FlexibleNullability] kotlin.collections.Map?) declared in java.util.LinkedHashMap' type=java.util.LinkedHashMap.plus?, V1 of .plus?> origin=null : K1 of .plus? : V1 of .plus? p0: GET_VAR ': kotlin.collections.Map.plus, V1 of .plus> declared in .plus' type=kotlin.collections.Map.plus, V1 of .plus> origin=null diff --git a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt index d949bd49cce..06817186574 100644 --- a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt +++ b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.txt @@ -3,27 +3,27 @@ FILE fqName: fileName:/javaConstructorWithTypeParameters.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1 (): .J1 declared in ' CONSTRUCTOR_CALL 'public constructor () declared in .J1' type=.J1 origin=null - : kotlin.Int? + : @[FlexibleNullability] kotlin.Int? FUN name:test2 visibility:public modality:FINAL <> () returnType:.J1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): .J1 declared in ' CONSTRUCTOR_CALL 'public constructor (x1: X1 of .J1.?) declared in .J1' type=.J1 origin=null - : kotlin.Int? - : kotlin.Int? + : @[FlexibleNullability] kotlin.Int? + : @[FlexibleNullability] kotlin.Int? x1: CONST Int type=kotlin.Int value=1 FUN name:test3 visibility:public modality:FINAL <> (j1:.J1) returnType:.J1.J2 VALUE_PARAMETER name:j1 index:0 type:.J1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3 (j1: .J1): .J1.J2 declared in ' CONSTRUCTOR_CALL 'public constructor () declared in .J1.J2' type=.J1.J2 origin=null - : kotlin.Int? + : @[FlexibleNullability] kotlin.Int? $outer: GET_VAR 'j1: .J1 declared in .test3' type=.J1 origin=null FUN name:test4 visibility:public modality:FINAL <> (j1:.J1) returnType:.J1.J2 VALUE_PARAMETER name:j1 index:0 type:.J1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test4 (j1: .J1): .J1.J2 declared in ' CONSTRUCTOR_CALL 'public constructor (x2: X2 of .J1.J2.?) declared in .J1.J2' type=.J1.J2 origin=null - : kotlin.Int? - : kotlin.Int? + : @[FlexibleNullability] kotlin.Int? + : @[FlexibleNullability] kotlin.Int? $outer: GET_VAR 'j1: .J1 declared in .test4' type=.J1 origin=null x2: CONST Int type=kotlin.Int value=1 diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt new file mode 100644 index 00000000000..951243fb016 --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt @@ -0,0 +1,11 @@ +FILE fqName: fileName:/javaSyntheticProperty.kt + PROPERTY name:test visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static] + EXPRESSION_BODY + CALL 'public open fun getFoo (): kotlin.String? declared in .J' type=kotlin.String? origin=GET_PROPERTY + $this: CONSTRUCTOR_CALL 'public/*package*/ constructor () [primary] declared in .J' type=.J origin=null + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String? + correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static]' type=kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt index 682ee0fbff0..3fed59d2988 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL // !DUMP_DEPENDENCIES // FILE: javaSyntheticProperty.kt val test = J().foo diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt index 951243fb016..1aab95618c8 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt @@ -1,11 +1,11 @@ FILE fqName: fileName:/javaSyntheticProperty.kt PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:@[FlexibleNullability] kotlin.String? visibility:private [final,static] EXPRESSION_BODY - CALL 'public open fun getFoo (): kotlin.String? declared in .J' type=kotlin.String? origin=GET_PROPERTY + CALL 'public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY $this: CONSTRUCTOR_CALL 'public/*package*/ constructor () [primary] declared in .J' type=.J origin=null - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String? + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static]' type=kotlin.String? origin=null + RETURN type=kotlin.Nothing from='public final fun (): @[FlexibleNullability] kotlin.String? declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:@[FlexibleNullability] kotlin.String? visibility:private [final,static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt index 1134c1bfbee..92c38f47e76 100644 --- a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt +++ b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.txt @@ -1,10 +1,10 @@ FILE fqName: fileName:/jdkClassSyntheticProperty.kt PROPERTY name:test visibility:public modality:FINAL [val] - FUN name: visibility:public modality:FINAL <> ($receiver:java.lang.Class<*>) returnType:kotlin.Array? + FUN name: visibility:public modality:FINAL <> ($receiver:java.lang.Class<*>) returnType:@[FlexibleNullability] kotlin.Array? correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] $receiver: VALUE_PARAMETER name: type:java.lang.Class<*> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array? declared in ' - CALL 'public open fun getDeclaredFields (): kotlin.Array? declared in java.lang.Class' type=kotlin.Array? origin=GET_PROPERTY - <1>: kotlin.Any? + RETURN type=kotlin.Nothing from='public final fun (): @[FlexibleNullability] kotlin.Array? declared in ' + CALL 'public open fun getDeclaredFields (): @[FlexibleNullability] kotlin.Array? declared in java.lang.Class' type=@[FlexibleNullability] kotlin.Array? origin=GET_PROPERTY + <1>: @[FlexibleNullability] kotlin.Any? $this: GET_VAR ': java.lang.Class<*> declared in .' type=java.lang.Class<*> origin=null diff --git a/compiler/testData/ir/irText/types/asOnPlatformType.txt b/compiler/testData/ir/irText/types/asOnPlatformType.txt index 97aeb566a43..eb995862022 100644 --- a/compiler/testData/ir/irText/types/asOnPlatformType.txt +++ b/compiler/testData/ir/irText/types/asOnPlatformType.txt @@ -1,26 +1,26 @@ FILE fqName: fileName:/asOnPlatformType.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - VAR name:nullStr type:kotlin.String? [val] - CALL 'public open fun nullString (): kotlin.String? declared in .JavaClass' type=kotlin.String? origin=null - VAR name:nonnullStr type:kotlin.String? [val] - CALL 'public open fun nonnullString (): kotlin.String? declared in .JavaClass' type=kotlin.String? origin=null + VAR name:nullStr type:@[FlexibleNullability] kotlin.String? [val] + CALL 'public open fun nullString (): @[FlexibleNullability] kotlin.String? declared in .JavaClass' type=@[FlexibleNullability] kotlin.String? origin=null + VAR name:nonnullStr type:@[FlexibleNullability] kotlin.String? [val] + CALL 'public open fun nonnullString (): @[FlexibleNullability] kotlin.String? declared in .JavaClass' type=@[FlexibleNullability] kotlin.String? origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun foo (): T of .foo [inline] declared in ' type=kotlin.String? origin=null - : kotlin.String? - $receiver: GET_VAR 'val nullStr: kotlin.String? [val] declared in .test' type=kotlin.String? origin=null + CALL 'public final fun foo (): T of .foo [inline] declared in ' type=@[FlexibleNullability] kotlin.String? origin=null + : @[FlexibleNullability] kotlin.String? + $receiver: GET_VAR 'val nullStr: @[FlexibleNullability] kotlin.String? [val] declared in .test' type=@[FlexibleNullability] kotlin.String? origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun foo (): T of .foo [inline] declared in ' type=kotlin.String? origin=null - : kotlin.String? - $receiver: GET_VAR 'val nonnullStr: kotlin.String? [val] declared in .test' type=kotlin.String? origin=null + CALL 'public final fun foo (): T of .foo [inline] declared in ' type=@[FlexibleNullability] kotlin.String? origin=null + : @[FlexibleNullability] kotlin.String? + $receiver: GET_VAR 'val nonnullStr: @[FlexibleNullability] kotlin.String? [val] declared in .test' type=@[FlexibleNullability] kotlin.String? origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun fooN (): T of .fooN? [inline] declared in ' type=kotlin.String? origin=null - : kotlin.String? - $receiver: GET_VAR 'val nullStr: kotlin.String? [val] declared in .test' type=kotlin.String? origin=null + : @[FlexibleNullability] kotlin.String? + $receiver: GET_VAR 'val nullStr: @[FlexibleNullability] kotlin.String? [val] declared in .test' type=@[FlexibleNullability] kotlin.String? origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun fooN (): T of .fooN? [inline] declared in ' type=kotlin.String? origin=null - : kotlin.String? - $receiver: GET_VAR 'val nonnullStr: kotlin.String? [val] declared in .test' type=kotlin.String? origin=null + : @[FlexibleNullability] kotlin.String? + $receiver: GET_VAR 'val nonnullStr: @[FlexibleNullability] kotlin.String? [val] declared in .test' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:foo visibility:public modality:FINAL ($receiver:T of .foo) returnType:T of .foo [inline] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] $receiver: VALUE_PARAMETER name: type:T of .foo diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.txt index 534d10006d3..2b8d09b1db3 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullability.txt @@ -37,15 +37,15 @@ FILE fqName: fileName:/enhancedNullability.kt FUN name:testJUse visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public open fun use (s: kotlin.String?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null - s: CALL 'public open fun nullString (): kotlin.String? declared in .J' type=kotlin.String? origin=null + s: CALL 'public open fun nullString (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null CALL 'public open fun use (s: kotlin.String?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null s: CALL 'public open fun notNullString (): kotlin.String? declared in .J' type=kotlin.String? origin=null FUN name:testLocalVarUse visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - VAR name:ns type:kotlin.String? [val] - CALL 'public open fun nullString (): kotlin.String? declared in .J' type=kotlin.String? origin=null + VAR name:ns type:@[FlexibleNullability] kotlin.String? [val] + CALL 'public open fun nullString (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null CALL 'public open fun use (s: kotlin.String?): kotlin.Unit declared in .J' type=kotlin.Unit origin=null - s: GET_VAR 'val ns: kotlin.String? [val] declared in .testLocalVarUse' type=kotlin.String? origin=null + s: GET_VAR 'val ns: @[FlexibleNullability] kotlin.String? [val] declared in .testLocalVarUse' type=@[FlexibleNullability] kotlin.String? origin=null VAR name:nns type:kotlin.String [val] TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String CALL 'public open fun notNullString (): kotlin.String? declared in .J' type=kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.txt index 983024480cb..4b159efac85 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.txt @@ -134,16 +134,16 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY COMPOSITE type=kotlin.Unit origin=DESTRUCTURING_DECLARATION - VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] - CALL 'public open fun notNullComponents (): .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? declared in .J' type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null + VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] + CALL 'public open fun notNullComponents (): @[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? declared in .J' type=@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null VAR name:x type:@[NotNull(value = )] kotlin.String? [val] CALL 'public final fun component1 (): T1 of .Q [operator] declared in .Q' type=@[NotNull(value = )] kotlin.String? origin=COMPONENT_N(index=1) $this: TYPE_OP type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> origin=IMPLICIT_NOTNULL typeOperand=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> - GET_VAR 'val tmp_1: .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2' type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null + GET_VAR 'val tmp_1: @[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2' type=@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null VAR name:y type:@[NotNull(value = )] kotlin.String? [val] CALL 'public final fun component2 (): T2 of .Q [operator] declared in .Q' type=@[NotNull(value = )] kotlin.String? origin=COMPONENT_N(index=2) $this: TYPE_OP type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> origin=IMPLICIT_NOTNULL typeOperand=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> - GET_VAR 'val tmp_1: .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2' type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null + GET_VAR 'val tmp_1: @[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2' type=@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in ' type=kotlin.Unit origin=null x: TYPE_OP type=@[NotNull(value = )] kotlin.String origin=IMPLICIT_NOTNULL typeOperand=@[NotNull(value = )] kotlin.String GET_VAR 'val x: @[NotNull(value = )] kotlin.String? [val] declared in .test2' type=@[NotNull(value = )] kotlin.String? origin=null @@ -151,18 +151,18 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt GET_VAR 'val y: @[NotNull(value = )] kotlin.String? [val] declared in .test2' type=@[NotNull(value = )] kotlin.String? origin=null FUN name:test2Desugared visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - VAR name:tmp type:.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] - CALL 'public open fun notNullComponents (): .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? declared in .J' type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null + VAR name:tmp type:@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] + CALL 'public open fun notNullComponents (): @[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? declared in .J' type=@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null VAR name:x type:@[NotNull(value = )] kotlin.String [val] TYPE_OP type=@[NotNull(value = )] kotlin.String origin=IMPLICIT_NOTNULL typeOperand=@[NotNull(value = )] kotlin.String CALL 'public final fun component1 (): T1 of .Q [operator] declared in .Q' type=@[NotNull(value = )] kotlin.String? origin=null $this: TYPE_OP type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> origin=IMPLICIT_NOTNULL typeOperand=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> - GET_VAR 'val tmp: .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2Desugared' type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null + GET_VAR 'val tmp: @[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2Desugared' type=@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null VAR name:y type:@[NotNull(value = )] kotlin.String [val] TYPE_OP type=@[NotNull(value = )] kotlin.String origin=IMPLICIT_NOTNULL typeOperand=@[NotNull(value = )] kotlin.String CALL 'public final fun component2 (): T2 of .Q [operator] declared in .Q' type=@[NotNull(value = )] kotlin.String? origin=null $this: TYPE_OP type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> origin=IMPLICIT_NOTNULL typeOperand=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?> - GET_VAR 'val tmp: .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2Desugared' type=.Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null + GET_VAR 'val tmp: @[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? [val] declared in .test2Desugared' type=@[FlexibleNullability] .Q<@[NotNull(value = )] kotlin.String?, @[NotNull(value = )] kotlin.String?>? origin=null CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in ' type=kotlin.Unit origin=null x: GET_VAR 'val x: @[NotNull(value = )] kotlin.String [val] declared in .test2Desugared' type=@[NotNull(value = )] kotlin.String origin=null y: GET_VAR 'val y: @[NotNull(value = )] kotlin.String [val] declared in .test2Desugared' type=@[NotNull(value = )] kotlin.String origin=null @@ -193,7 +193,7 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt $receiver: CALL 'public final fun withIndex (): kotlin.collections.Iterable> declared in kotlin.collections' type=kotlin.collections.Iterable)] .P?>> origin=null : @[NotNull(value = )] .P? $receiver: TYPE_OP type=kotlin.collections.List<@[NotNull(value = )] .P?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<@[NotNull(value = )] .P?> - CALL 'public open fun listOfNotNull (): kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null + CALL 'public open fun listOfNotNull (): @[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=@[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null VAR name:x type:kotlin.Int [val] CALL 'public final fun component1 (): kotlin.Int [operator] declared in kotlin.collections.IndexedValue' type=kotlin.Int origin=COMPONENT_N(index=1) $this: GET_VAR 'val tmp_3: kotlin.collections.IndexedValue<@[NotNull(value = )] .P?> [val] declared in .test4' type=kotlin.collections.IndexedValue<@[NotNull(value = )] .P?> origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.txt index d940e2f0e0f..1d660a2c97d 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator [fake_override,operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=FOR_LOOP_ITERATOR $this: TYPE_OP type=kotlin.collections.MutableList<*> origin=IMPLICIT_CAST typeOperand=kotlin.collections.MutableList<*> TYPE_OP type=kotlin.collections.List<@[NotNull(value = )] .P?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<@[NotNull(value = )] .P?> - CALL 'public open fun listOfNotNull (): kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null + CALL 'public open fun listOfNotNull (): @[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=@[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.MutableIterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT $this: GET_VAR 'val tmp_0: kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> [val] declared in .testForInListUnused' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=null @@ -25,7 +25,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator [fake_override,operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=FOR_LOOP_ITERATOR $this: TYPE_OP type=kotlin.collections.MutableList<*> origin=IMPLICIT_CAST typeOperand=kotlin.collections.MutableList<*> TYPE_OP type=kotlin.collections.List<@[NotNull(value = )] .P?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<@[NotNull(value = )] .P?> - CALL 'public open fun listOfNotNull (): kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null + CALL 'public open fun listOfNotNull (): @[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=@[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.MutableIterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT $this: GET_VAR 'val tmp_1: kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> [val] declared in .testForInListDestructured' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=null @@ -48,7 +48,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator [fake_override,operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=null $this: TYPE_OP type=kotlin.collections.MutableList<*> origin=IMPLICIT_CAST typeOperand=kotlin.collections.MutableList<*> TYPE_OP type=kotlin.collections.List<@[NotNull(value = )] .P?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<@[NotNull(value = )] .P?> - CALL 'public open fun listOfNotNull (): kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null + CALL 'public open fun listOfNotNull (): @[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=@[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null WHILE label=null origin=WHILE_LOOP condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.MutableIterator' type=kotlin.Boolean origin=null $this: GET_VAR 'val iterator: kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> [val] declared in .testDesugaredForInList' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=null @@ -82,7 +82,7 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator [fake_override,operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=FOR_LOOP_ITERATOR $this: TYPE_OP type=kotlin.collections.MutableList<*> origin=IMPLICIT_CAST typeOperand=kotlin.collections.MutableList<*> TYPE_OP type=kotlin.collections.List<@[NotNull(value = )] .P?> origin=IMPLICIT_NOTNULL typeOperand=kotlin.collections.List<@[NotNull(value = )] .P?> - CALL 'public open fun listOfNotNull (): kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null + CALL 'public open fun listOfNotNull (): @[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? declared in .J' type=@[FlexibleNullability] kotlin.collections.List<@[NotNull(value = )] .P?>? origin=null WHILE label=null origin=FOR_LOOP_INNER_WHILE condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.MutableIterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT $this: GET_VAR 'val tmp_4: kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> [val] declared in .testForInListUse' type=kotlin.collections.MutableIterator<@[NotNull(value = )] .P?> origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.txt b/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.txt index 399287b11da..de3dddc4aeb 100644 --- a/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.txt +++ b/compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.txt @@ -5,9 +5,9 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testPlatformEqualsPlatform (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Double' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double - CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformEqualsPlatform' type=.JavaClass origin=null - other: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + other: CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformEqualsPlatform' type=.JavaClass origin=null FUN name:testPlatformEqualsKotlin visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Boolean $receiver: VALUE_PARAMETER name: type:.JavaClass @@ -15,7 +15,7 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testPlatformEqualsKotlin (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Double' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double - CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformEqualsKotlin' type=.JavaClass origin=null other: CONST Double type=kotlin.Double value=0.0 FUN name:testKotlinEqualsPlatform visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Boolean @@ -24,7 +24,7 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testKotlinEqualsPlatform (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Double' type=kotlin.Boolean origin=null $this: CONST Double type=kotlin.Double value=0.0 - other: CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + other: CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testKotlinEqualsPlatform' type=.JavaClass origin=null FUN name:testPlatformCompareToPlatform visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Int $receiver: VALUE_PARAMETER name: type:.JavaClass @@ -32,10 +32,10 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testPlatformCompareToPlatform (): kotlin.Int declared in ' CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null $this: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double - CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformCompareToPlatform' type=.JavaClass origin=null other: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double - CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformCompareToPlatform' type=.JavaClass origin=null FUN name:testPlatformCompareToKotlin visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Int $receiver: VALUE_PARAMETER name: type:.JavaClass @@ -43,7 +43,7 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv RETURN type=kotlin.Nothing from='public final fun testPlatformCompareToKotlin (): kotlin.Int declared in ' CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null $this: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double - CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testPlatformCompareToKotlin' type=.JavaClass origin=null other: CONST Double type=kotlin.Double value=0.0 FUN name:testKotlinCompareToPlatform visibility:public modality:FINAL <> ($receiver:.JavaClass) returnType:kotlin.Int @@ -53,5 +53,5 @@ FILE fqName: fileName:/explicitEqualsAndCompareToCallsOnPlatformTypeReceiv CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int [operator] declared in kotlin.Double' type=kotlin.Int origin=null $this: CONST Double type=kotlin.Double value=0.0 other: TYPE_OP type=kotlin.Double origin=IMPLICIT_NOTNULL typeOperand=kotlin.Double - CALL 'public open fun null0 (): kotlin.Double? declared in .JavaClass' type=kotlin.Double? origin=null + CALL 'public open fun null0 (): @[FlexibleNullability] kotlin.Double? declared in .JavaClass' type=@[FlexibleNullability] kotlin.Double? origin=null $this: GET_VAR ': .JavaClass declared in .testKotlinCompareToPlatform' type=.JavaClass origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.txt index ed26848572c..2e123715a37 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.txt @@ -59,10 +59,10 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt BLOCK_BODY CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun s (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun s (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY FUN name:testContains visibility:public modality:FINAL <> (m:.MySet) returnType:kotlin.Unit VALUE_PARAMETER name:m index:0 type:.MySet BLOCK_BODY @@ -70,7 +70,7 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt CALL 'public open fun contains (element: kotlin.String): kotlin.Boolean [operator] declared in .MySet' type=kotlin.Boolean origin=null $this: GET_VAR 'm: .MySet declared in .testContains' type=.MySet origin=null element: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:kotlin.String? visibility:public [static]' type=kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public open fun contains (element: kotlin.String): kotlin.Boolean [operator] declared in .MySet' type=kotlin.Boolean origin=null $this: GET_VAR 'm: .MySet declared in .testContains' type=.MySet origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.txt b/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.txt index e9ca8d32ba0..0f4d66ee814 100644 --- a/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.txt +++ b/compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.txt @@ -29,11 +29,11 @@ FILE fqName: fileName:/nullabilityAssertionOnExtensionReceiver.kt BLOCK_BODY CALL 'public final fun extension (): kotlin.Unit declared in ' type=kotlin.Unit origin=null $receiver: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun s (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun s (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:testMemberExt visibility:public modality:FINAL <> ($receiver:.C) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:.C BLOCK_BODY CALL 'public final fun memberExtension (): kotlin.Unit declared in .C' type=kotlin.Unit origin=null $this: GET_VAR ': .C declared in .testMemberExt' type=.C origin=null $receiver: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - CALL 'public open fun s (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun s (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.txt b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.txt index 8c4e618ba4b..94d28f4c722 100644 --- a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.txt +++ b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.txt @@ -4,12 +4,12 @@ FILE fqName: fileName:/platformTypeReceiver.kt RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_NOTNULL typeOperand=kotlin.Boolean - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:kotlin.Boolean? visibility:public [static]' type=kotlin.Boolean? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:@[FlexibleNullability] kotlin.Boolean? visibility:public [static]' type=@[FlexibleNullability] kotlin.Boolean? origin=GET_PROPERTY other: CONST Null type=kotlin.Nothing? value=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_NOTNULL typeOperand=kotlin.Boolean - CALL 'public open fun boolNull (): kotlin.Boolean? declared in .J' type=kotlin.Boolean? origin=null + CALL 'public open fun boolNull (): @[FlexibleNullability] kotlin.Boolean? declared in .J' type=@[FlexibleNullability] kotlin.Boolean? origin=null other: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/types/receiverOfIntersectionType.txt b/compiler/testData/ir/irText/types/receiverOfIntersectionType.txt index 6e42c1e26cc..5c4675cb678 100644 --- a/compiler/testData/ir/irText/types/receiverOfIntersectionType.txt +++ b/compiler/testData/ir/irText/types/receiverOfIntersectionType.txt @@ -117,35 +117,35 @@ FILE fqName: fileName:/receiverOfIntersectionType.kt GET_VAR 'val v: .K [val] declared in .testIntersection' type=.K origin=null FUN name:testFlexible1 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - VAR name:v type:.K? [val] - WHEN type=.K? origin=IF + VAR name:v type:@[FlexibleNullability] .K? [val] + WHEN type=@[FlexibleNullability] .K? origin=IF BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun a (): .A? declared in .Java' type=.A? origin=null + then: CALL 'public open fun a (): @[FlexibleNullability] .A? declared in .Java' type=@[FlexibleNullability] .A? origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun b (): .B? declared in .Java' type=.B? origin=null + then: CALL 'public open fun b (): @[FlexibleNullability] .B? declared in .Java' type=@[FlexibleNullability] .B? origin=null CALL 'public abstract fun ff (): kotlin.Unit declared in .I' type=kotlin.Unit origin=null $this: TYPE_OP type=.I origin=IMPLICIT_CAST typeOperand=.I TYPE_OP type=.K origin=IMPLICIT_NOTNULL typeOperand=.K - GET_VAR 'val v: .K? [val] declared in .testFlexible1' type=.K? origin=null + GET_VAR 'val v: @[FlexibleNullability] .K? [val] declared in .testFlexible1' type=@[FlexibleNullability] .K? origin=null FUN name:testFlexible2 visibility:public modality:FINAL <> (a:.A, b:.B) returnType:kotlin.Unit VALUE_PARAMETER name:a index:0 type:.A VALUE_PARAMETER name:b index:1 type:.B BLOCK_BODY - VAR name:v type:.K? [val] - WHEN type=.K? origin=IF + VAR name:v type:@[FlexibleNullability] .K? [val] + WHEN type=@[FlexibleNullability] .K? origin=IF BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun id (x: T of .Java.id?): T of .Java.id? declared in .Java' type=.A? origin=null - : .A? + then: CALL 'public open fun id (x: T of .Java.id?): T of .Java.id? declared in .Java' type=@[FlexibleNullability] .A? origin=null + : @[FlexibleNullability] .A? x: GET_VAR 'a: .A declared in .testFlexible2' type=.A origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun id (x: T of .Java.id?): T of .Java.id? declared in .Java' type=.B? origin=null - : .B? + then: CALL 'public open fun id (x: T of .Java.id?): T of .Java.id? declared in .Java' type=@[FlexibleNullability] .B? origin=null + : @[FlexibleNullability] .B? x: GET_VAR 'b: .B declared in .testFlexible2' type=.B origin=null CALL 'public abstract fun ff (): kotlin.Unit declared in .I' type=kotlin.Unit origin=null $this: TYPE_OP type=.I origin=IMPLICIT_CAST typeOperand=.I TYPE_OP type=.K origin=IMPLICIT_NOTNULL typeOperand=.K - GET_VAR 'val v: .K? [val] declared in .testFlexible2' type=.K? origin=null + GET_VAR 'val v: @[FlexibleNullability] .K? [val] declared in .testFlexible2' type=@[FlexibleNullability] .K? origin=null diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.txt index 8c9701788ee..c5facaabdea 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.txt @@ -22,6 +22,6 @@ FILE fqName: fileName:/smartCastOnFieldReceiverOfGenericType.kt GET_VAR 'a: kotlin.Any declared in .testGetField' type=kotlin.Any origin=null RETURN type=kotlin.Nothing from='public final fun testGetField (a: kotlin.Any): kotlin.String declared in ' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:T of .JCell? visibility:public' type=kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:T of .JCell? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY receiver: TYPE_OP type=.JCell origin=IMPLICIT_CAST typeOperand=.JCell GET_VAR 'a: kotlin.Any declared in .testGetField' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/sourceRanges/declarations/classes.txt b/compiler/testData/ir/sourceRanges/declarations/classes.txt index a9f5d90c539..23f8233982c 100644 --- a/compiler/testData/ir/sourceRanges/declarations/classes.txt +++ b/compiler/testData/ir/sourceRanges/declarations/classes.txt @@ -61,7 +61,7 @@ @17:0..18:11 VALUE_PARAMETER name: type:kotlin.Enum<.Test5> @18:0..11 FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<.Test5>) returnType:kotlin.Unit [fake_override] @17:0..18:11 VALUE_PARAMETER name: type:kotlin.Enum<.Test5> - @18:0..11 FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test5>) returnType:java.lang.Class<.Test5?>? [fake_override] + @18:0..11 FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test5>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .Test5?>? [fake_override] @17:0..18:11 VALUE_PARAMETER name: type:kotlin.Enum<.Test5> @18:0..11 FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.Test5>, other:.Test5) returnType:kotlin.Int [fake_override,operator] @17:0..18:11 VALUE_PARAMETER name: type:kotlin.Enum<.Test5>