From 922b1e576d2226bdd3c78a166a16ae1715e508de Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 17 Oct 2019 13:19:55 +0300 Subject: [PATCH] IR serialization: isExpect (TODO actual value in proto) --- .../serialization/IrFileDeserializer.kt | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt index 0834dcc8839..1bc28ada8cc 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt @@ -980,11 +980,12 @@ abstract class IrFileDeserializer( deserializeClassKind(proto.kind), deserializeVisibility(proto.visibility), modality, - proto.isCompanion, - proto.isInner, - proto.isData, - proto.isExternal, - proto.isInline + isCompanion = proto.isCompanion, + isInner = proto.isInner, + isData = proto.isData, + isExternal = proto.isExternal, + isInline = proto.isInline, + isExpect = false // TODO isExpect ) }.usingParent { proto.declarationContainer.declarationList.mapTo(declarations) { deserializeDeclaration(it) } @@ -1052,10 +1053,11 @@ abstract class IrFileDeserializer( deserializeVisibility(proto.base.visibility), deserializeModality(proto.modality), deserializeIrType(proto.base.returnType), - proto.base.isInline, - proto.base.isExternal, - proto.isTailrec, - proto.isSuspend + isInline = proto.base.isInline, + isExternal = proto.base.isExternal, + isTailrec = proto.isTailrec, + isSuspend = proto.isSuspend, + isExpect = false // TODO isExpect ) }.apply { proto.overriddenList.mapTo(overriddenSymbols) { deserializeIrSymbol(it) as IrSimpleFunctionSymbol } @@ -1136,9 +1138,10 @@ abstract class IrFileDeserializer( deserializeName(proto.base.name), deserializeVisibility(proto.base.visibility), deserializeIrType(proto.base.returnType), - proto.base.isInline, - proto.base.isExternal, - proto.isPrimary + isInline = proto.base.isInline, + isExternal = proto.base.isExternal, + isPrimary = proto.isPrimary, + isExpect = false // TODO isExpect ) }.apply { (descriptor as? WrappedClassConstructorDescriptor)?.bind(this)