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

Fix after rebase

Browse Source
This commit is contained in:
Leonid Startsev
2018-08-16 13:19:47 +03:00
parent 090f7e67eb
commit 359a37c9c3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/jvm/JVMCodegenUtil.kt
+8 -1
View File
@@ -94,7 +94,14 @@ fun InstructionAdapter.genKOutputMethodCall(property: SerializableProperty, clas
val sti = getSerialTypeInfo(property, propertyType)
val useSerializer = if (fromClassStartVar == null) stackValueSerializerInstanceFromSerializer(classCodegen, sti)
else stackValueSerializerInstanceFromClass(classCodegen, sti, fromClassStartVar)
if (!sti.unit) classCodegen.genPropertyOnStack(this, expressionCodegen.context, property.descriptor, propertyOwnerType, ownerVar)
if (!sti.unit) ImplementationBodyCodegen.genPropertyOnStack(
this,
expressionCodegen.context,
property.descriptor,
propertyOwnerType,
ownerVar,
classCodegen.state
)
invokeinterface(kOutputType.internalName,
CallingConventions.encode + sti.elementMethodPrefix + (if (useSerializer) "Serializable" else "") + CallingConventions.elementPostfix,
"(" + descType.descriptor + "I" +