From 9894c216c1775da05376997312609746022186d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= Date: Fri, 10 May 2019 11:00:15 +0200 Subject: [PATCH] Fix test for static default methods in KotlinTypeMapper --- .../src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt index f19dc9c2a56..cb16fc4d397 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt @@ -910,7 +910,8 @@ class KotlinTypeMapper @JvmOverloads constructor( val isConstructor = isConstructor(jvmSignature) val descriptor = getDefaultDescriptor( jvmSignature, - if (isStaticMethod(kind, functionDescriptor) || isConstructor) null else ownerType.descriptor, + if (isStaticMethod(kind, functionDescriptor) || isStaticDeclaration(functionDescriptor) || isConstructor) + null else ownerType.descriptor, functionDescriptor.unwrapFrontendVersion() )