From 3dff3d61f539fd63e9a962f6a98aed4a2e119375 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 13 Jun 2018 12:49:14 +0200 Subject: [PATCH] Skip generic signature in bridges --- .../kotlin/backend/jvm/codegen/FunctionCodegen.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt index 8b15c1c3dd8..212036b1705 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt @@ -24,10 +24,7 @@ import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.FunctionCodegen import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.ir.declarations.IrClass -import org.jetbrains.kotlin.ir.declarations.IrConstructor -import org.jetbrains.kotlin.ir.declarations.IrFunction -import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction +import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.util.dump import org.jetbrains.kotlin.ir.util.hasAnnotation import org.jetbrains.kotlin.ir.util.isAnnotationClass @@ -109,7 +106,8 @@ open class FunctionCodegen(private val irFunction: IrFunction, private val class irFunction.OtherOrigin, flags, signature.asmMethod.name, signature.asmMethod.descriptor, - signature.genericsSignature, null/*TODO support exception*/ + if (irFunction.origin == IrDeclarationOrigin.BRIDGE) null else signature.genericsSignature, + null/*TODO support exception*/ ) }