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

FIR JVM serializer: fix compilation after rebase

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-22 09:54:43 +03:00
parent 6e143a2656
commit 393189db8d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt
+4 -2
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.protobuf.GeneratedMessageLite
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.jvm.annotations.JVM_DEFAULT_FQ_NAME import org.jetbrains.kotlin.resolve.jvm.annotations.JVM_DEFAULT_FQ_NAME
import org.jetbrains.kotlin.serialization.DescriptorSerializer 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.Type
import org.jetbrains.org.objectweb.asm.commons.Method import org.jetbrains.org.objectweb.asm.commons.Method
@@ -43,7 +44,8 @@ class FirJvmSerializerExtension(
private val bindings: JvmSerializationBindings, private val bindings: JvmSerializationBindings,
state: GenerationState, state: GenerationState,
private val irClass: IrClass, private val irClass: IrClass,
private val localDelegatedProperties: List<FirProperty> private val localDelegatedProperties: List<FirProperty>,
private val approximator: AbstractTypeApproximator
) : FirSerializerExtension() { ) : FirSerializerExtension() {
private val globalBindings = state.globalSerializationBindings private val globalBindings = state.globalSerializationBindings
override val stringTable = FirJvmElementAwareStringTable() override val stringTable = FirJvmElementAwareStringTable()
@@ -151,7 +153,7 @@ class FirJvmSerializerExtension(
extension: GeneratedMessageLite.GeneratedExtension<MessageType, List<ProtoBuf.Property>> extension: GeneratedMessageLite.GeneratedExtension<MessageType, List<ProtoBuf.Property>>
) { ) {
for (localVariable in localDelegatedProperties) { 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) proto.addExtension(extension, serializer.propertyProto(localVariable)?.build() ?: continue)
} }
} }
compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt
+1 -1
View File
@@ -140,7 +140,7 @@ class FirMetadataSerializer(
} ?: emptyList() } ?: emptyList()
private val serializerExtension = private val serializerExtension =
FirJvmSerializerExtension(session, serializationBindings, context.state, irClass, localDelegatedProperties) FirJvmSerializerExtension(session, serializationBindings, context.state, irClass, localDelegatedProperties, approximator)
private val serializer: FirElementSerializer? = private val serializer: FirElementSerializer? =
when (val metadata = irClass.metadata) { when (val metadata = irClass.metadata) {