From 9676cd26cfe5adb960f8c1c96009d9d7b17d5c89 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Tue, 26 Apr 2022 11:29:48 +0300 Subject: [PATCH] FIR: Adjust Fir2IrText test data --- .../fromKEEP/compareTo.fir.ir.txt | 16 ++++----- .../fromKEEP/compareTo.fir.kt.txt | 6 ++-- ...ructorWithOwnTypeParametersCall.fir.ir.txt | 16 ++++----- ...ructorWithOwnTypeParametersCall.fir.kt.txt | 4 +-- .../sam/samConstructors.fir.ir.txt | 6 ++-- .../sam/samConstructors.fir.kt.txt | 4 +-- .../sam/samConversionToGeneric.fir.ir.txt | 6 ++-- .../sam/samConversionToGeneric.fir.kt.txt | 4 +-- .../firProblems/AllCandidates.fir.ir.txt | 2 +- .../firProblems/AllCandidates.fir.kt.txt | 2 +- ...vaConstructorWithTypeParameters.fir.ir.txt | 36 +++++++++---------- ...vaConstructorWithTypeParameters.fir.kt.txt | 16 ++++----- 12 files changed, 59 insertions(+), 59 deletions(-) diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt index b28ccdfe336..1b18359e48f 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt @@ -197,8 +197,8 @@ FILE fqName: fileName:/compareTo.kt $this: GET_VAR ': .Pair., T of .> declared in .' type=.Pair., T of .> origin=null FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY - VAR name:comparator type:java.util.Comparator<@[FlexibleNullability] kotlin.String?> [val] - TYPE_OP type=java.util.Comparator<@[FlexibleNullability] kotlin.String?> origin=SAM_CONVERSION typeOperand=java.util.Comparator<@[FlexibleNullability] kotlin.String?> + VAR name:comparator type:java.util.Comparator [val] + TYPE_OP type=java.util.Comparator origin=SAM_CONVERSION typeOperand=java.util.Comparator FUN_EXPR type=kotlin.Function2<@[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?, kotlin.Int> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (a:@[FlexibleNullability] kotlin.String?, b:@[FlexibleNullability] kotlin.String?) returnType:kotlin.Int VALUE_PARAMETER name:a index:0 type:@[FlexibleNullability] kotlin.String? @@ -228,12 +228,12 @@ FILE fqName: fileName:/compareTo.kt $this: GET_VAR 'b: @[FlexibleNullability] kotlin.String? declared in .box.' type=@[FlexibleNullability] kotlin.String? origin=null RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' CALL 'public final fun with (receiver: T of kotlin.StandardKt.with, block: @[ExtensionFunctionType] kotlin.Function1): R of kotlin.StandardKt.with [inline] declared in kotlin.StandardKt' type=kotlin.String origin=null - : java.util.Comparator<@[FlexibleNullability] kotlin.String?> + : java.util.Comparator : kotlin.String - receiver: GET_VAR 'val comparator: java.util.Comparator<@[FlexibleNullability] kotlin.String?> [val] declared in .box' type=java.util.Comparator<@[FlexibleNullability] kotlin.String?> origin=null - block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1, kotlin.String> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:java.util.Comparator<@[FlexibleNullability] kotlin.String?>) returnType:kotlin.String - $receiver: VALUE_PARAMETER name:$this$with type:java.util.Comparator<@[FlexibleNullability] kotlin.String?> + receiver: GET_VAR 'val comparator: java.util.Comparator [val] declared in .box' type=java.util.Comparator origin=null + block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1, kotlin.String> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:java.util.Comparator) returnType:kotlin.String + $receiver: VALUE_PARAMETER name:$this$with type:java.util.Comparator BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' CALL 'public final fun (_context_receiver_0: java.util.Comparator.>): T of . declared in ' type=kotlin.String origin=GET_PROPERTY @@ -243,4 +243,4 @@ FILE fqName: fileName:/compareTo.kt : kotlin.String first: CONST String type=kotlin.String value="OK" second: CONST String type=kotlin.String value="fail" - _context_receiver_0: GET_VAR '$this$with: java.util.Comparator<@[FlexibleNullability] kotlin.String?> declared in .box.' type=java.util.Comparator<@[FlexibleNullability] kotlin.String?> origin=null + _context_receiver_0: GET_VAR '$this$with: java.util.Comparator declared in .box.' type=java.util.Comparator origin=null diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt index 4c3c3c04443..4d012fc171b 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt @@ -73,7 +73,7 @@ val Pair.min: T } fun box(): String { - val comparator: Comparator<@FlexibleNullability String?> = local fun (a: @FlexibleNullability String?, b: @FlexibleNullability String?): Int { + val comparator: Comparator = local fun (a: @FlexibleNullability String?, b: @FlexibleNullability String?): Int { return when { when { EQEQ(arg0 = a, arg1 = null) -> true @@ -82,8 +82,8 @@ fun box(): String { else -> a.().compareTo(other = b.()) } } - /*-> Comparator<@FlexibleNullability String?> */ - return with, String>(receiver = comparator, block = local fun Comparator<@FlexibleNullability String?>.(): String { + /*-> Comparator */ + return with, String>(receiver = comparator, block = local fun Comparator.(): String { return Pair(first = "OK", second = "fail").(_context_receiver_0 = $this$with) } ) diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.ir.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.ir.txt index 262d0393dcc..a634f718f4e 100644 --- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.ir.txt @@ -6,15 +6,15 @@ FILE fqName: fileName:/constructorWithOwnTypeParametersCall.kt : kotlin.String $outer: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .K1' type=.K1 origin=null : kotlin.Int - FUN name:testJava visibility:public modality:FINAL <> () returnType:.J1.J2<@[FlexibleNullability] kotlin.Double?, @[FlexibleNullability] kotlin.Int?> + FUN name:testJava visibility:public modality:FINAL <> () returnType:.J1.J2 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun testJava (): .J1.J2<@[FlexibleNullability] kotlin.Double?, @[FlexibleNullability] kotlin.Int?> declared in ' - CONSTRUCTOR_CALL 'public constructor () declared in .J1.J2' type=.J1.J2<@[FlexibleNullability] kotlin.Double?, @[FlexibleNullability] kotlin.Int?> origin=null - : @[FlexibleNullability] kotlin.Double? - : @[FlexibleNullability] kotlin.CharSequence? - $outer: CONSTRUCTOR_CALL 'public constructor () declared in .J1' type=.J1<@[FlexibleNullability] kotlin.Int?> origin=null - : @[FlexibleNullability] kotlin.Int? - : @[FlexibleNullability] kotlin.String? + 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 + $outer: CONSTRUCTOR_CALL 'public constructor () declared in .J1' type=.J1 origin=null + : kotlin.Int + : 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] reified:false diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.kt.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.kt.txt index 8cd1979ca21..f2a25f75596 100644 --- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.kt.txt @@ -2,8 +2,8 @@ fun testKotlin(): K2 { return K1().K2() } -fun testJava(): J2<@FlexibleNullability Double?, @FlexibleNullability Int?> { - return J1<@FlexibleNullability Int?, @FlexibleNullability String?>().J2<@FlexibleNullability Double?, @FlexibleNullability CharSequence?>() +fun testJava(): J2 { + return J1().J2() } class K1 { diff --git a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.ir.txt b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.ir.txt index 5a8a356001d..d746e6a05e5 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.ir.txt @@ -21,10 +21,10 @@ FILE fqName: fileName:/samConstructors.kt RETURN type=kotlin.Nothing from='public final fun test3 (): java.lang.Runnable declared in ' TYPE_OP type=java.lang.Runnable origin=SAM_CONVERSION typeOperand=java.lang.Runnable FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null reflectionTarget= - FUN name:test4 visibility:public modality:FINAL <> () returnType:java.util.Comparator<@[FlexibleNullability] kotlin.Int?> + FUN name:test4 visibility:public modality:FINAL <> () returnType:java.util.Comparator BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test4 (): java.util.Comparator<@[FlexibleNullability] kotlin.Int?> declared in ' - TYPE_OP type=java.util.Comparator<@[FlexibleNullability] kotlin.Int?> origin=SAM_CONVERSION typeOperand=java.util.Comparator<@[FlexibleNullability] kotlin.Int?> + 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<@[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? diff --git a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.kt.txt index 0f97e07317a..fe137c8037c 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.kt.txt @@ -16,10 +16,10 @@ fun test3(): Runnable { return ::foo /*-> Runnable */ } -fun test4(): Comparator<@FlexibleNullability Int?> { +fun test4(): Comparator { return local fun (a: @FlexibleNullability Int?, b: @FlexibleNullability Int?): Int { return a.minus(other = b /*!! Int */) } - /*-> Comparator<@FlexibleNullability Int?> */ + /*-> Comparator */ } diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.ir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.ir.txt index 227875e181b..0433313d775 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.ir.txt @@ -1,8 +1,8 @@ FILE fqName: fileName:/samConversionToGeneric.kt - FUN name:test1 visibility:public modality:FINAL <> () returnType:.J<@[FlexibleNullability] kotlin.String?> + FUN name:test1 visibility:public modality:FINAL <> () returnType:.J BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (): .J<@[FlexibleNullability] kotlin.String?> declared in ' - TYPE_OP type=.J<@[FlexibleNullability] kotlin.String?> origin=SAM_CONVERSION typeOperand=.J<@[FlexibleNullability] kotlin.String?> + 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<@[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? diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.kt.txt index 8fedaddc1f2..777d3e82313 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.fir.kt.txt @@ -1,8 +1,8 @@ -fun test1(): J<@FlexibleNullability String?> { +fun test1(): J { return local fun (x: @FlexibleNullability String?): @FlexibleNullability String? { return x } - /*-> J<@FlexibleNullability String?> */ + /*-> J */ } fun test2(): J<@FlexibleNullability String?> { diff --git a/compiler/testData/ir/irText/firProblems/AllCandidates.fir.ir.txt b/compiler/testData/ir/irText/firProblems/AllCandidates.fir.ir.txt index 5f97584df8c..7368ca181d5 100644 --- a/compiler/testData/ir/irText/firProblems/AllCandidates.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/AllCandidates.fir.ir.txt @@ -58,7 +58,7 @@ FILE fqName: fileName:/AllCandidates.kt CALL 'public final fun apply (block: @[ExtensionFunctionType] kotlin.Function1): T of kotlin.StandardKt.apply [inline] declared in kotlin.StandardKt' type=@[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] A of .allCandidatesResult?>? origin=null : @[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] A of .allCandidatesResult?>? $receiver: CALL 'public open fun nameNotFound (): @[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] R of .OverloadResolutionResultsImpl.nameNotFound?>? declared in .OverloadResolutionResultsImpl' type=@[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] A of .allCandidatesResult?>? origin=null - : @[FlexibleNullability] A of .allCandidatesResult? + : A of .allCandidatesResult block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<@[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] A of .allCandidatesResult?>?, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:@[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] A of .allCandidatesResult?>?) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name:$this$apply type:@[FlexibleNullability] .OverloadResolutionResultsImpl<@[FlexibleNullability] A of .allCandidatesResult?>? diff --git a/compiler/testData/ir/irText/firProblems/AllCandidates.fir.kt.txt b/compiler/testData/ir/irText/firProblems/AllCandidates.fir.kt.txt index 143474446d5..250b0a80165 100644 --- a/compiler/testData/ir/irText/firProblems/AllCandidates.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/AllCandidates.fir.kt.txt @@ -21,7 +21,7 @@ class MyCandidate { } private fun allCandidatesResult(allCandidates: Collection): @FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>? { - return nameNotFound<@FlexibleNullability A?>().apply<@FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>?>(block = local fun @FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>?.() { + return nameNotFound().apply<@FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>?>(block = local fun @FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>?.() { $this$apply.setAllCandidates(allCandidates = allCandidates.map>(transform = local fun (it: MyCandidate): ResolvedCall { return it.() as ResolvedCall } diff --git a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.ir.txt index ac75c666454..fa19919e67b 100644 --- a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.ir.txt +++ b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.ir.txt @@ -1,29 +1,29 @@ FILE fqName: fileName:/javaConstructorWithTypeParameters.kt - FUN name:test1 visibility:public modality:FINAL <> () returnType:.J1<@[FlexibleNullability] kotlin.Int?> + FUN name:test1 visibility:public modality:FINAL <> () returnType:.J1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (): .J1<@[FlexibleNullability] kotlin.Int?> declared in ' - CONSTRUCTOR_CALL 'public constructor () declared in .J1' type=.J1<@[FlexibleNullability] kotlin.Int?> origin=null - : @[FlexibleNullability] kotlin.Int? - FUN name:test2 visibility:public modality:FINAL <> () returnType:.J1<@[FlexibleNullability] kotlin.Int?> + 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 + FUN name:test2 visibility:public modality:FINAL <> () returnType:.J1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test2 (): .J1<@[FlexibleNullability] kotlin.Int?> declared in ' - CONSTRUCTOR_CALL 'public constructor (x1: @[FlexibleNullability] X1 of .J1.?) declared in .J1' type=.J1<@[FlexibleNullability] kotlin.Int?> origin=null - : @[FlexibleNullability] kotlin.Int? - : @[FlexibleNullability] kotlin.Int? + RETURN type=kotlin.Nothing from='public final fun test2 (): .J1 declared in ' + CONSTRUCTOR_CALL 'public constructor (x1: @[FlexibleNullability] X1 of .J1.?) declared in .J1' type=.J1 origin=null + : kotlin.Int + : kotlin.Int x1: CONST Int type=kotlin.Int value=1 - FUN name:test3 visibility:public modality:FINAL <> (j1:.J1) returnType:.J1.J2<@[FlexibleNullability] kotlin.Int?, kotlin.Any> + 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<@[FlexibleNullability] kotlin.Int?, kotlin.Any> declared in ' - CONSTRUCTOR_CALL 'public constructor () declared in .J1.J2' type=.J1.J2<@[FlexibleNullability] kotlin.Int?, kotlin.Any> origin=null - : @[FlexibleNullability] kotlin.Int? + 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 $outer: GET_VAR 'j1: .J1 declared in .test3' type=.J1 origin=null - FUN name:test4 visibility:public modality:FINAL <> (j1:.J1) returnType:.J1.J2<@[FlexibleNullability] kotlin.Int?, kotlin.Any> + 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<@[FlexibleNullability] kotlin.Int?, kotlin.Any> declared in ' - CONSTRUCTOR_CALL 'public constructor (x2: @[FlexibleNullability] X2 of .J1.J2.?) declared in .J1.J2' type=.J1.J2<@[FlexibleNullability] kotlin.Int?, kotlin.Any> origin=null - : @[FlexibleNullability] kotlin.Int? - : @[FlexibleNullability] kotlin.Int? + RETURN type=kotlin.Nothing from='public final fun test4 (j1: .J1): .J1.J2 declared in ' + CONSTRUCTOR_CALL 'public constructor (x2: @[FlexibleNullability] X2 of .J1.J2.?) declared in .J1.J2' type=.J1.J2 origin=null + : kotlin.Int + : 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/javaConstructorWithTypeParameters.fir.kt.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.kt.txt index d932d1df450..8d3a59334f3 100644 --- a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.kt.txt +++ b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.kt.txt @@ -1,15 +1,15 @@ -fun test1(): J1<@FlexibleNullability Int?> { - return J1<@FlexibleNullability Int?>() +fun test1(): J1 { + return J1() } -fun test2(): J1<@FlexibleNullability Int?> { - return J1<@FlexibleNullability Int?, @FlexibleNullability Int?>(x1 = 1) +fun test2(): J1 { + return J1(x1 = 1) } -fun test3(j1: J1): J2<@FlexibleNullability Int?, Any> { - return j1.J2<@FlexibleNullability Int?>() +fun test3(j1: J1): J2 { + return j1.J2() } -fun test4(j1: J1): J2<@FlexibleNullability Int?, Any> { - return j1.J2<@FlexibleNullability Int?, @FlexibleNullability Int?>(x2 = 1) +fun test4(j1: J1): J2 { + return j1.J2(x2 = 1) }