Serialize/Deserialize const modifier

core/deserialization/src/descriptors.proto

@@ -250,6 +250,7 @@ message Callable {
      hasGetter
      hasSetter
      hasConstant
+     isConst
      lateinit
    */
   optional int32 flags = 1;

core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java

@@ -48,7 +48,9 @@ public class Flags {
     public static final FlagField<Boolean> HAS_SETTER = FlagField.booleanAfter(HAS_GETTER);
     public static final FlagField<Boolean> HAS_CONSTANT = FlagField.booleanAfter(HAS_SETTER);
 
-    public static final FlagField<Boolean> LATE_INIT = FlagField.booleanAfter(HAS_CONSTANT);
+    public static final FlagField<Boolean> IS_CONST = FlagField.booleanAfter(HAS_CONSTANT);
+
+    public static final FlagField<Boolean> LATE_INIT = FlagField.booleanAfter(IS_CONST);
 
     // Parameters
 
@@ -115,7 +117,8 @@ public class Flags {
             boolean hasGetter,
             boolean hasSetter,
             boolean hasConstant,
-            boolean lateInit
+            boolean lateInit,
+            boolean isConst
     ) {
         return HAS_ANNOTATIONS.toFlags(hasAnnotations)
                | MODALITY.toFlags(modality(modality))
@@ -126,6 +129,7 @@ public class Flags {
                | HAS_SETTER.toFlags(hasSetter)
                | HAS_CONSTANT.toFlags(hasConstant)
                | LATE_INIT.toFlags(lateInit)
+               | IS_CONST.toFlags(isConst)
                ;
     }
 

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt

@@ -45,8 +45,6 @@ public class MemberDeserializer(private val c: DeserializationContext) {
     private fun loadProperty(proto: Callable): PropertyDescriptor {
         val flags = proto.getFlags()
 
-        val lateInit = Flags.LATE_INIT.get(flags)
-
         val property = DeserializedPropertyDescriptor(
                 c.containingDeclaration, null,
                 getAnnotations(proto, flags, AnnotatedCallableKind.PROPERTY),
@@ -57,7 +55,8 @@ public class MemberDeserializer(private val c: DeserializationContext) {
                 Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)),
                 proto,
                 c.nameResolver,
-                Flags.LATE_INIT.get(flags)
+                Flags.LATE_INIT.get(flags),
+                Flags.IS_CONST.get(flags)
         )
 
         val local = c.childContext(property, proto.getTypeParameterList())

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt

@@ -39,10 +39,11 @@ public class DeserializedPropertyDescriptor(
         kind: Kind,
         override public val proto: ProtoBuf.Callable,
         override public val nameResolver: NameResolver,
-        lateInit: Boolean
+        lateInit: Boolean,
+        isConst: Boolean
 ) : DeserializedCallableMemberDescriptor,
     PropertyDescriptorImpl(containingDeclaration, original, annotations,
-                           modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE, lateInit, false) {
+                           modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE, lateInit, isConst) {
 
     override fun createSubstitutedCopy(
             newOwner: DeclarationDescriptor,
@@ -52,6 +53,6 @@ public class DeserializedPropertyDescriptor(
             kind: Kind
     ): PropertyDescriptorImpl {
         return DeserializedPropertyDescriptor(
-                newOwner, original, annotations, newModality, newVisibility, isVar, name, kind, proto, nameResolver, isLateInit, false)
+                newOwner, original, annotations, newModality, newVisibility, isVar, name, kind, proto, nameResolver, isLateInit, isConst)
     }
 }