From 19ac0b2fadf65e5387da800b27ac8515d7567353 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Thu, 26 Apr 2018 18:54:44 +0300 Subject: [PATCH] Fix serialization of classes with overrides and default arguments. --- .../kotlin/backend/konan/serialization/SerializeIr.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt index 7e5687407d7..b2cae0926db 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt @@ -47,6 +47,7 @@ import org.jetbrains.kotlin.metadata.KonanIr.IrConst.ValueCase.* import org.jetbrains.kotlin.metadata.KonanIr.IrOperation.OperationCase.* import org.jetbrains.kotlin.metadata.KonanIr.IrVarargElement.VarargElementCase.* import org.jetbrains.kotlin.metadata.KonanLinkData +import org.jetbrains.kotlin.resolve.calls.components.hasDefaultValue import org.jetbrains.kotlin.resolve.descriptorUtil.parents import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassConstructorDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor @@ -187,8 +188,7 @@ internal class IrSerializer(val context: Context, // Am I observing an IR generation regression? // I see a lack of arg for an empty vararg, // rather than an empty vararg node. - assert(it.varargElementType != null || - it.declaresDefaultValue()) + assert(it.varargElementType != null || it.hasDefaultValue()) } else { argOrNull.expression = serializeExpression(actual) }