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
libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt
+2 -1
View File
@@ -22,6 +22,7 @@ import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging import org.gradle.api.logging.Logging
import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.AbstractCompile
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
import org.jetbrains.kotlin.gradle.plugin.SubpluginOption import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
@@ -63,7 +64,7 @@ class SerializationKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile
javaCompile: AbstractCompile?, javaCompile: AbstractCompile?,
variantData: Any?, variantData: Any?,
androidProjectHandler: Any?, androidProjectHandler: Any?,
javaSourceSet: SourceSet? kotlinCompilation: KotlinCompilation?
) )
: List<SubpluginOption> { : List<SubpluginOption> {
return emptyList() return emptyList()
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 sti = getSerialTypeInfo(property, propertyType)
val useSerializer = if (fromClassStartVar == null) stackValueSerializerInstanceFromSerializer(classCodegen, sti) val useSerializer = if (fromClassStartVar == null) stackValueSerializerInstanceFromSerializer(classCodegen, sti)
else stackValueSerializerInstanceFromClass(classCodegen, sti, fromClassStartVar) 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, invokeinterface(kOutputType.internalName,
CallingConventions.encode + sti.elementMethodPrefix + (if (useSerializer) "Serializable" else "") + CallingConventions.elementPostfix, CallingConventions.encode + sti.elementMethodPrefix + (if (useSerializer) "Serializable" else "") + CallingConventions.elementPostfix,
"(" + descType.descriptor + "I" + "(" + descType.descriptor + "I" +