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

JVM_IR: Generate suspend fun main wrapper as class instead of reference

Browse Source 
This way, there is no getName, getOwner and getSignature generated.
 #KT-37404: Open
This commit is contained in:
Ilmir Usmanov
2020-03-10 15:42:12 +01:00
parent e495c35ad7
commit fd70b10b17
9 changed files with 122 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/CallableReferenceLowering.kt
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt
+78 -18
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.backend.jvm.lower
import org.jetbrains.kotlin.backend.common.ClassLoweringPass
import org.jetbrains.kotlin.backend.common.ir.allParameters
import org.jetbrains.kotlin.backend.common.ir.copyTo
import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
@@ -18,15 +20,18 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.builders.declarations.addFunction
import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
import org.jetbrains.kotlin.ir.builders.declarations.*
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.declarations.IrValueParameter
import org.jetbrains.kotlin.ir.declarations.copyAttributes
import org.jetbrains.kotlin.ir.expressions.IrCall
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.functions
import org.jetbrains.kotlin.ir.util.isFileClass
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.load.java.JavaVisibilities
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.Variance
@@ -130,19 +135,74 @@ private class MainMethodGenerationLowering(private val context: JvmBackendContex
body = context.createIrBuilder(symbol).irBlockBody { makeBody(args) }
}
private fun IrBuilderWithScope.irRunSuspend(target: IrSimpleFunction, args: IrValueParameter?) =
irCall(this@MainMethodGenerationLowering.context.ir.symbols.runSuspendFunction).apply {
val reference = IrFunctionReferenceImpl(
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
this@MainMethodGenerationLowering.context.ir.symbols.suspendFunctionN(0).typeWith(context.irBuiltIns.anyNType),
target.symbol,
typeArgumentsCount = 0,
reflectionTarget = null
)
if (args != null) {
reference.putValueArgument(0, irGet(args))
private fun IrBuilderWithScope.irRunSuspend(target: IrSimpleFunction, args: IrValueParameter?): IrExpression {
val backendContext = this@MainMethodGenerationLowering.context
return irBlock {
val wrapperConstructor = buildClass {
name = Name.special("<main-wrapper>")
visibility = JavaVisibilities.PACKAGE_VISIBILITY
modality = Modality.FINAL
origin = JvmLoweredDeclarationOrigin.FUNCTION_REFERENCE_IMPL
}.let { wrapper ->
+wrapper
wrapper.createImplicitParameterDeclarationWithWrappedDescriptor()
val lambdaSuperClass = backendContext.ir.symbols.lambdaClass
val functionClass = backendContext.ir.symbols.getJvmSuspendFunctionClass(0)
wrapper.superTypes += lambdaSuperClass.defaultType
wrapper.superTypes += functionClass.typeWith(backendContext.irBuiltIns.anyNType)
wrapper.parent = target.parent
val stringArrayType = backendContext.irBuiltIns.arrayClass.typeWith(backendContext.irBuiltIns.stringType)
val argsField = args?.let { wrapper.addField("args", stringArrayType) }
wrapper.addFunction("invoke", backendContext.irBuiltIns.anyNType, isSuspend = true).also { invoke ->
val invokeToOverride = functionClass.functions.single()
invoke.overriddenSymbols += invokeToOverride
invoke.body = backendContext.createIrBuilder(invoke.symbol).irBlockBody {
+irReturn(irCall(target.symbol).also { call ->
if (args != null) {
call.putValueArgument(0, irGetField(irGet(invoke.dispatchReceiverParameter!!), argsField!!))
}
})
}
}
wrapper.addConstructor {
isPrimary = true
visibility = JavaVisibilities.PACKAGE_VISIBILITY
}.also { constructor ->
val superClassConstructor = lambdaSuperClass.owner.constructors.single()
val param = args?.let { constructor.addValueParameter("args", stringArrayType) }
constructor.body = backendContext.createIrBuilder(constructor.symbol).irBlockBody {
+irDelegatingConstructorCall(superClassConstructor).also {
it.putValueArgument(0, irInt(1))
}
if (args != null) {
+irSetField(irGet(wrapper.thisReceiver!!), argsField!!, irGet(param!!))
}
}
}
}
+irCall(backendContext.ir.symbols.runSuspendFunction).apply {
putValueArgument(
0, IrConstructorCallImpl.fromSymbolOwner(
UNDEFINED_OFFSET,
UNDEFINED_OFFSET,
wrapperConstructor.returnType,
wrapperConstructor.symbol
).also {
if (args != null) {
it.putValueArgument(0, irGet(args))
}
}
)
}
putValueArgument(0, reference)
}
}
}
compiler/testData/codegen/bytecodeListing/main/multifileSuspend.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
@file:JvmMultifileClass
@file:JvmName("Foo")
compiler/testData/codegen/bytecodeListing/main/multifileSuspend_ir.txt
Vendored
+22
View File
@@ -0,0 +1,22 @@
@kotlin.Metadata
public final class Hello/Foo {
public final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
}
@kotlin.Metadata
synthetic final class Hello/Foo__MultifileSuspendKt$main$2 {
private field args: java.lang.String[]
inner class Hello/Foo__MultifileSuspendKt$main$2
method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
public synthetic bridge @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
@kotlin.jvm.JvmName
synthetic final class Hello/Foo__MultifileSuspendKt {
inner class Hello/Foo__MultifileSuspendKt$main$2
public synthetic final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
}
compiler/testData/codegen/bytecodeListing/main/parameterlessMain.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
fun main() {}
compiler/testData/codegen/bytecodeListing/main/parameterlessMain_ir.txt
Vendored
+5
View File
@@ -0,0 +1,5 @@
@kotlin.Metadata
public final class ParameterlessMainKt {
public final static method main(): void
public synthetic final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
}
compiler/testData/codegen/bytecodeListing/main/suspendMain.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
suspend fun main(args: Array<String>) {}
compiler/testData/codegen/bytecodeListing/main/suspendMain_before.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// !LANGUAGE: -ExtendedMainConvention -ReleaseCoroutines
// Does not run on JVM_IR since it uses experimental coroutines
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
compiler/testData/codegen/bytecodeListing/main/suspendMain_ir.txt
Vendored
+15
View File
@@ -0,0 +1,15 @@
@kotlin.Metadata
synthetic final class SuspendMainKt$main$2 {
private field args: java.lang.String[]
inner class SuspendMainKt$main$2
method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
public synthetic bridge @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
public final class SuspendMainKt {
inner class SuspendMainKt$main$2
public synthetic final static method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object
}