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

Do not serizalize null as compile time constant

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-02-17 13:11:28 +03:00
parent ead3a1dc65
commit fac2e38054
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+4 -1
View File
@@ -22,6 +22,8 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.kotlin.descriptors.annotations.Annotated;
import org.jetbrains.kotlin.resolve.DescriptorFactory; import org.jetbrains.kotlin.resolve.DescriptorFactory;
import org.jetbrains.kotlin.resolve.MemberComparator; 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 org.jetbrains.kotlin.types.*;
import java.util.ArrayList; 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( builder.setFlags(Flags.getCallableFlags(