From fac2e380543a903ba975da3fa54729a859dcc5d6 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 17 Feb 2015 13:11:28 +0300 Subject: [PATCH] Do not serizalize null as compile time constant --- .../jetbrains/kotlin/serialization/DescriptorSerializer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 5322f6b4bc5..f5fb97dc94e 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -22,6 +22,8 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.kotlin.resolve.DescriptorFactory; import org.jetbrains.kotlin.resolve.MemberComparator; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.NullValue; import org.jetbrains.kotlin.types.*; import java.util.ArrayList; @@ -182,7 +184,8 @@ public class DescriptorSerializer { } } - hasConstant = propertyDescriptor.getCompileTimeInitializer() != null; + CompileTimeConstant compileTimeConstant = propertyDescriptor.getCompileTimeInitializer(); + hasConstant = !(compileTimeConstant == null || compileTimeConstant instanceof NullValue); } builder.setFlags(Flags.getCallableFlags(