From 40e09a39c1da5179465068fd3328bdec96169ac8 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 12 Apr 2017 17:16:07 +0300 Subject: [PATCH] Fix prototype JVM BE tests --- .../kotlin/backend/common/lower/LocalFunctionsLowering.kt | 2 +- .../org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt index 119792e4ed5..b799b63ae57 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt @@ -214,7 +214,7 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL return if (oldCallee.typeParameters.isEmpty()) null - else oldCallee.typeParameters.associateBy( + else oldCallee.original.typeParameters.associateBy( { newCallee.typeParameters[it.index] }, { oldExpression.getTypeArgument(it)!! } ) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt index 5f5bfbc80f4..7dbb729db8e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt @@ -136,6 +136,7 @@ class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBac } fun generateMethod(method: IrFunction) { + if (method.descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) return FunctionCodegen(method, this).generate() }