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

JVM_IR: Allow delegated companion objects.

Browse Source 
This currently leads to a compilation error due to metadata
generation.
This commit is contained in:
Mads Ager
2019-06-03 10:55:41 +02:00
committed by Alexander Udalov
parent 4ddd9f081b
commit 71604851fe
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+1 -1
View File
@@ -227,7 +227,7 @@ open class ClassCodegen protected constructor(
val descriptor = field.metadata?.descriptor val descriptor = field.metadata?.descriptor
if (descriptor != null) { if (descriptor != null) {
val codegen = if (JvmAbi.isPropertyWithBackingFieldInOuterClass(descriptor)) { val codegen = if (field.origin != IrDeclarationOrigin.DELEGATE && JvmAbi.isPropertyWithBackingFieldInOuterClass(descriptor)) {
companionObjectCodegen ?: error("Class with a property moved from the companion must have a companion:\n${irClass.dump()}") companionObjectCodegen ?: error("Class with a property moved from the companion must have a companion:\n${irClass.dump()}")
} else this } else this
codegen.visitor.serializationBindings.put(JvmSerializationBindings.FIELD_FOR_PROPERTY, descriptor, fieldType to fieldName) codegen.visitor.serializationBindings.put(JvmSerializationBindings.FIELD_FOR_PROPERTY, descriptor, fieldType to fieldName)
compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
package test package test
interface T { interface T {