[FIR2IR] Fix cast insertion in SAM conversion with suspend conversion
#KT-65878 #KT-62855
This commit is contained in:
committed by
Space Team
parent
a2a217799b
commit
b054a4481d
@@ -1,73 +0,0 @@
|
||||
MODULE main
|
||||
CLASS Kt50477EnabledKt$box$1.class
|
||||
Property: class.signature
|
||||
K1
|
||||
NULL
|
||||
K2
|
||||
Lkotlin/jvm/internal/FunctionReferenceImpl;Lkotlin/jvm/functions/Function1<Lkotlin/coroutines/Continuation<-Lkotlin/Unit;>;Ljava/lang/Object;>;Lkotlin/coroutines/jvm/internal/SuspendFunction;
|
||||
Property: class.superClassInternalName
|
||||
K1
|
||||
java/lang/Object
|
||||
K2
|
||||
kotlin/jvm/internal/FunctionReferenceImpl
|
||||
Property: class.superInterfaces
|
||||
K1
|
||||
[FI, kotlin/jvm/internal/FunctionAdapter]
|
||||
K2
|
||||
[kotlin/coroutines/jvm/internal/SuspendFunction, kotlin/jvm/functions/Function1]
|
||||
K1
|
||||
call(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
equals(Ljava/lang/Object;)Z [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
getFunctionDelegate()Lkotlin/Function; [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
hashCode()I [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
---
|
||||
K2
|
||||
invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; [public, final]
|
||||
CLASS Kt50477EnabledKt$box$4.class
|
||||
Property: class.signature
|
||||
K1
|
||||
NULL
|
||||
K2
|
||||
Lkotlin/jvm/internal/FunctionReferenceImpl;Lkotlin/jvm/functions/Function1<Lkotlin/coroutines/Continuation<-Lkotlin/Unit;>;Ljava/lang/Object;>;Lkotlin/coroutines/jvm/internal/SuspendFunction;
|
||||
Property: class.superClassInternalName
|
||||
K1
|
||||
java/lang/Object
|
||||
K2
|
||||
kotlin/jvm/internal/FunctionReferenceImpl
|
||||
Property: class.superInterfaces
|
||||
K1
|
||||
[FI, kotlin/jvm/internal/FunctionAdapter]
|
||||
K2
|
||||
[kotlin/coroutines/jvm/internal/SuspendFunction, kotlin/jvm/functions/Function1]
|
||||
K1
|
||||
call(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
equals(Ljava/lang/Object;)Z [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
getFunctionDelegate()Lkotlin/Function; [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
hashCode()I [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
---
|
||||
K2
|
||||
invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; [public, final]
|
||||
@@ -1,6 +1,5 @@
|
||||
// !LANGUAGE: +SuspendOnlySamConversions
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
// JVM_ABI_K1_K2_DIFF: KT-62855
|
||||
|
||||
fun interface FI {
|
||||
suspend fun call() // suspending now(!!!)
|
||||
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
MODULE main
|
||||
Missing in K1
|
||||
ChainedFunSuspendConversionForSimpleExpressionKt$sam$SuspendRunnable$0.class
|
||||
CLASS ChainedFunSuspendConversionForSimpleExpressionKt$test$2.class
|
||||
Property: class.signature
|
||||
K1
|
||||
NULL
|
||||
K2
|
||||
Lkotlin/jvm/internal/FunctionReferenceImpl;Lkotlin/jvm/functions/Function1<Lkotlin/coroutines/Continuation<-Lkotlin/Unit;>;Ljava/lang/Object;>;Lkotlin/coroutines/jvm/internal/SuspendFunction;
|
||||
Property: class.superClassInternalName
|
||||
K1
|
||||
java/lang/Object
|
||||
K2
|
||||
kotlin/jvm/internal/FunctionReferenceImpl
|
||||
Property: class.superInterfaces
|
||||
K1
|
||||
[SuspendRunnable, kotlin/jvm/internal/FunctionAdapter]
|
||||
K2
|
||||
[kotlin/coroutines/jvm/internal/SuspendFunction, kotlin/jvm/functions/Function1]
|
||||
K1
|
||||
equals(Ljava/lang/Object;)Z [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
getFunctionDelegate()Lkotlin/Function; [public, final]
|
||||
K2
|
||||
---
|
||||
K1
|
||||
hashCode()I [public, final]
|
||||
K2
|
||||
---
|
||||
Vendored
-1
@@ -1,6 +1,5 @@
|
||||
// !LANGUAGE: +SuspendConversion
|
||||
// IGNORE_BACKEND: JVM
|
||||
// JVM_ABI_K1_K2_DIFF: KT-62855
|
||||
|
||||
fun interface SuspendRunnable {
|
||||
suspend fun invoke()
|
||||
|
||||
Vendored
-1
@@ -2,6 +2,5 @@ MODULE main
|
||||
Missing in K1
|
||||
Test1$Scope$bar$1.class
|
||||
Test2$Scope$bar$1.class
|
||||
SuspendAndFunConversionInDisabledModeKt$sam$SuspendRunnable$0.class
|
||||
Missing in K2
|
||||
SuspendAndFunConversionInDisabledModeKt$sam$Runnable$0.class
|
||||
|
||||
Vendored
+27
-30
@@ -31,37 +31,34 @@ FILE fqName:<root> fileName:/chainedFunSuspendConversionForSimpleExpression.kt
|
||||
VALUE_PARAMETER name:f index:0 type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public final fun foo (s: <root>.SuspendRunnable): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
|
||||
s: TYPE_OP type=<root>.SuspendRunnable origin=SAM_CONVERSION typeOperand=<root>.SuspendRunnable
|
||||
TYPE_OP type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.coroutines.SuspendFunction0<kotlin.Unit>
|
||||
BLOCK type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION
|
||||
FUN ADAPTER_FOR_SUSPEND_CONVERSION name:suspendConversion visibility:local modality:FINAL <> ($receiver:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit [suspend]
|
||||
$receiver: VALUE_PARAMETER ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION name:callee type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=null
|
||||
$this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.test.suspendConversion' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
FUNCTION_REFERENCE 'local final fun suspendConversion (): kotlin.Unit declared in <root>.test' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
|
||||
$receiver: GET_VAR 'f: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
s: BLOCK type=<root>.SuspendRunnable origin=SUSPEND_CONVERSION
|
||||
FUN ADAPTER_FOR_SUSPEND_CONVERSION name:suspendConversion visibility:local modality:FINAL <> ($receiver:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit [suspend]
|
||||
$receiver: VALUE_PARAMETER ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION name:callee type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=null
|
||||
$this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.test.suspendConversion' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
TYPE_OP type=<root>.SuspendRunnable origin=SAM_CONVERSION typeOperand=<root>.SuspendRunnable
|
||||
FUNCTION_REFERENCE 'local final fun suspendConversion (): kotlin.Unit declared in <root>.test' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
|
||||
$receiver: GET_VAR 'f: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
CALL 'public final fun foo (s: <root>.SuspendRunnable): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
|
||||
s: TYPE_OP type=<root>.SuspendRunnable origin=SAM_CONVERSION typeOperand=<root>.SuspendRunnable
|
||||
TYPE_OP type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.coroutines.SuspendFunction0<kotlin.Unit>
|
||||
BLOCK type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION
|
||||
FUN ADAPTER_FOR_SUSPEND_CONVERSION name:suspendConversion visibility:local modality:FINAL <> ($receiver:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit [suspend]
|
||||
$receiver: VALUE_PARAMETER ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION name:callee type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=null
|
||||
$this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.test.suspendConversion' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
FUNCTION_REFERENCE 'local final fun suspendConversion (): kotlin.Unit declared in <root>.test' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
|
||||
$receiver: CALL 'public final fun bar (): kotlin.Function0<kotlin.Unit> declared in <root>' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
s: BLOCK type=<root>.SuspendRunnable origin=SUSPEND_CONVERSION
|
||||
FUN ADAPTER_FOR_SUSPEND_CONVERSION name:suspendConversion visibility:local modality:FINAL <> ($receiver:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit [suspend]
|
||||
$receiver: VALUE_PARAMETER ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION name:callee type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=null
|
||||
$this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.test.suspendConversion' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
TYPE_OP type=<root>.SuspendRunnable origin=SAM_CONVERSION typeOperand=<root>.SuspendRunnable
|
||||
FUNCTION_REFERENCE 'local final fun suspendConversion (): kotlin.Unit declared in <root>.test' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
|
||||
$receiver: CALL 'public final fun bar (): kotlin.Function0<kotlin.Unit> declared in <root>' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
VAR name:t type:kotlin.Function0<kotlin.Unit> [var]
|
||||
GET_VAR 'f: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
CALL 'public final fun foo (s: <root>.SuspendRunnable): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
|
||||
s: TYPE_OP type=<root>.SuspendRunnable origin=SAM_CONVERSION typeOperand=<root>.SuspendRunnable
|
||||
TYPE_OP type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.coroutines.SuspendFunction0<kotlin.Unit>
|
||||
BLOCK type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION
|
||||
FUN ADAPTER_FOR_SUSPEND_CONVERSION name:suspendConversion visibility:local modality:FINAL <> ($receiver:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit [suspend]
|
||||
$receiver: VALUE_PARAMETER ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION name:callee type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=null
|
||||
$this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.test.suspendConversion' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
FUNCTION_REFERENCE 'local final fun suspendConversion (): kotlin.Unit declared in <root>.test' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
|
||||
$receiver: GET_VAR 'var t: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
s: BLOCK type=<root>.SuspendRunnable origin=SUSPEND_CONVERSION
|
||||
FUN ADAPTER_FOR_SUSPEND_CONVERSION name:suspendConversion visibility:local modality:FINAL <> ($receiver:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit [suspend]
|
||||
$receiver: VALUE_PARAMETER ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION name:callee type:kotlin.Function0<kotlin.Unit>
|
||||
BLOCK_BODY
|
||||
CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=null
|
||||
$this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.test.suspendConversion' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
TYPE_OP type=<root>.SuspendRunnable origin=SAM_CONVERSION typeOperand=<root>.SuspendRunnable
|
||||
FUNCTION_REFERENCE 'local final fun suspendConversion (): kotlin.Unit declared in <root>.test' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
|
||||
$receiver: GET_VAR 'var t: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
|
||||
|
||||
Reference in New Issue
Block a user