diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt index 2339bb0d3dc..972221bf024 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt @@ -179,7 +179,7 @@ fun getOrCreateJvmSuspendFunctionView(function: D, bind bindingContext?.get(CodegenBinding.SUSPEND_FUNCTION_TO_JVM_VIEW, function)?.let { return it as D } val continuationParameter = ValueParameterDescriptorImpl( - function, null, function.valueParameters.size, Annotations.EMPTY, Name.identifier("\$continuation"), + function, null, function.valueParameters.size, Annotations.EMPTY, Name.identifier("continuation"), // Add j.l.Object to invoke(), because that is the type of parameters we have in FunctionN+1 if (function.containingDeclaration.safeAs()?.defaultType?.isBuiltinFunctionalType == true) function.builtIns.nullableAnyType diff --git a/compiler/testData/codegen/dumpDeclarations/suspendLambda.json b/compiler/testData/codegen/dumpDeclarations/suspendLambda.json index 13f21091d9e..ba114b0c326 100644 --- a/compiler/testData/codegen/dumpDeclarations/suspendLambda.json +++ b/compiler/testData/codegen/dumpDeclarations/suspendLambda.json @@ -4,10 +4,10 @@ "visibility": "local", "class": "SuspendLambdaKt$invokeCoroutineBuilder$1", "members": [ - {"visibility": "local", "declaration": "final fun kotlin.Any.(`$continuation`: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "invoke", "desc": "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"}, + {"visibility": "local", "declaration": "final fun kotlin.Any.(continuation: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "invoke", "desc": "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"}, {"visibility": "local", "declaration": "", "name": "p$", "desc": "Ljava/lang/Object;"}, {"name": "doResume", "desc": "(Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object;"}, - {"visibility": "local", "declaration": "final fun kotlin.Any.(`$continuation`: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "", "desc": "(Lkotlin/coroutines/experimental/Continuation;)V"}, + {"visibility": "local", "declaration": "final fun kotlin.Any.(continuation: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "", "desc": "(Lkotlin/coroutines/experimental/Continuation;)V"}, {"name": "create", "desc": "(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation;"}, {"name": "invoke", "desc": "(Ljava/lang/Object;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"} ] diff --git a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json index 317bd0f57ca..d652b1d1022 100644 --- a/compiler/testData/codegen/dumpDeclarations/suspendOverride.json +++ b/compiler/testData/codegen/dumpDeclarations/suspendOverride.json @@ -4,7 +4,7 @@ "visibility": "public", "class": "B", "members": [ - {"visibility": "public", "declaration": "open suspend fun foo(`$continuation`: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}, + {"visibility": "public", "declaration": "open suspend fun foo(continuation: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}, {"visibility": "public", "declaration": "constructor B()", "name": "", "desc": "()V"} ] }, @@ -29,7 +29,7 @@ "visibility": "public", "class": "A", "members": [ - {"visibility": "public", "declaration": "abstract suspend fun foo(`$continuation`: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"} + {"visibility": "public", "declaration": "abstract suspend fun foo(continuation: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"} ] }, { @@ -37,7 +37,7 @@ "visibility": "public", "class": "C", "members": [ - {"visibility": "public", "declaration": "final suspend fun foo(`$continuation`: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}, + {"visibility": "public", "declaration": "final suspend fun foo(continuation: kotlin.coroutines.experimental.Continuation): kotlin.Any?", "name": "foo", "desc": "(Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;"}, {"visibility": "public", "declaration": "constructor C()", "name": "", "desc": "()V"} ] }