From 4711e2f9dac6a61d34d5070c9b3eda4da1f6dff3 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 22 Jun 2017 14:02:53 +0200 Subject: [PATCH] Don't use kind for static check Lowers should perform proper transformations --- .../jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt | 3 +-- 1 file changed, 1 insertion(+), 2 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 caf856e0657..c450f4eb5ad 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 @@ -53,8 +53,7 @@ class FunctionCodegen(private val irFunction: IrFunction, private val classCodeg private fun doGenerate() { val signature = classCodegen.typeMapper.mapSignatureWithGeneric(descriptor, OwnerKind.IMPLEMENTATION) - val isStatic = isStaticMethod(OwnerKind.getMemberOwnerKind(classCodegen.descriptor), descriptor) || - DescriptorUtils.isStaticDeclaration(descriptor) + val isStatic = DescriptorUtils.isStaticDeclaration(descriptor) val frameMap = createFrameMapWithReceivers(classCodegen.state, descriptor, signature, isStatic)