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

Fix test for static default methods in KotlinTypeMapper

Browse Source
This commit is contained in:
Steven Schäfer
2019-05-10 11:00:15 +02:00
committed by max-kammerer
parent cf13293363
commit 9894c216c1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
+2 -1
View File
@@ -910,7 +910,8 @@ class KotlinTypeMapper @JvmOverloads constructor(
val isConstructor = isConstructor(jvmSignature) val isConstructor = isConstructor(jvmSignature)
val descriptor = getDefaultDescriptor( val descriptor = getDefaultDescriptor(
jvmSignature, jvmSignature,
if (isStaticMethod(kind, functionDescriptor) || isConstructor) null else ownerType.descriptor, if (isStaticMethod(kind, functionDescriptor) || isStaticDeclaration(functionDescriptor) || isConstructor)
null else ownerType.descriptor,
functionDescriptor.unwrapFrontendVersion() functionDescriptor.unwrapFrontendVersion()
) )