From a1ee247a7b6acb3537fdf8734d9ce1a05e87863c Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 16 Jun 2017 14:23:45 +0300 Subject: [PATCH] Allow deserialization of IrVariable without initializer. --- .../kotlin/backend/konan/serialization/SerializeIr.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 2033d413c69..b968904ae47 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 @@ -1087,7 +1087,10 @@ internal class IrDeserializer(val context: Context, fun deserializeIrVariable(proto: KonanIr.IrVar, descriptor: VariableDescriptor, start: Int, end: Int, origin: IrDeclarationOrigin): IrVariable { - val initializer = deserializeExpression(proto.getInitializer()) + val initializer = if (proto.hasInitializer()) { + deserializeExpression(proto.getInitializer()) + } else null + val variable = IrVariableImpl(start, end, origin, descriptor, initializer) return variable