From 393189db8d392c030c0facc5ea10f955acdc746f Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 22 Sep 2020 09:54:43 +0300 Subject: [PATCH] FIR JVM serializer: fix compilation after rebase --- .../kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt | 6 ++++-- .../kotlin/fir/backend/jvm/FirMetadataSerializer.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt index 1e6349d913d..bfe869d19ce 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.protobuf.GeneratedMessageLite import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.annotations.JVM_DEFAULT_FQ_NAME import org.jetbrains.kotlin.serialization.DescriptorSerializer +import org.jetbrains.kotlin.types.AbstractTypeApproximator import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.commons.Method @@ -43,7 +44,8 @@ class FirJvmSerializerExtension( private val bindings: JvmSerializationBindings, state: GenerationState, private val irClass: IrClass, - private val localDelegatedProperties: List + private val localDelegatedProperties: List, + private val approximator: AbstractTypeApproximator ) : FirSerializerExtension() { private val globalBindings = state.globalSerializationBindings override val stringTable = FirJvmElementAwareStringTable() @@ -151,7 +153,7 @@ class FirJvmSerializerExtension( extension: GeneratedMessageLite.GeneratedExtension> ) { for (localVariable in localDelegatedProperties) { - val serializer = FirElementSerializer.createForLambda(session, this) + val serializer = FirElementSerializer.createForLambda(session, this, approximator) proto.addExtension(extension, serializer.propertyProto(localVariable)?.build() ?: continue) } } diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt index 167813df43a..d615b5c7a50 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt @@ -140,7 +140,7 @@ class FirMetadataSerializer( } ?: emptyList() private val serializerExtension = - FirJvmSerializerExtension(session, serializationBindings, context.state, irClass, localDelegatedProperties) + FirJvmSerializerExtension(session, serializationBindings, context.state, irClass, localDelegatedProperties, approximator) private val serializer: FirElementSerializer? = when (val metadata = irClass.metadata) {