Serialize/Deserialize const modifier

compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java

@@ -179,10 +179,12 @@ public class DescriptorSerializer {
         boolean hasSetter = false;
         boolean hasConstant = false;
         boolean lateInit = false;
+        boolean isConst = false;
 
         if (descriptor instanceof PropertyDescriptor) {
             PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor;
             lateInit = propertyDescriptor.isLateInit();
+            isConst = propertyDescriptor.isConst();
 
             int propertyFlags = Flags.getAccessorFlags(
                     hasAnnotations(propertyDescriptor),
@@ -232,7 +234,8 @@ public class DescriptorSerializer {
                 hasGetter,
                 hasSetter,
                 hasConstant,
-                lateInit
+                lateInit,
+                isConst
         ));
 
         for (TypeParameterDescriptor typeParameterDescriptor : descriptor.getTypeParameters()) {

compiler/testData/loadJava/compiledKotlin/prop/Const.kt

@@ -0,0 +1,14 @@
+//ALLOW_AST_ACCESS
+package test
+
+const private val topLevel = 1
+
+object A {
+    const protected val inObject = 2
+}
+
+class B {
+    companion object {
+        const val inCompanion = 3
+    }
+}

compiler/testData/loadJava/compiledKotlin/prop/Const.txt

@@ -0,0 +1,20 @@
+package test
+
+private const val topLevel: kotlin.Int = 1
+    private fun <get-topLevel>(): kotlin.Int
+
+public object A {
+    /*primary*/ private constructor A()
+    protected const final val inObject: kotlin.Int = 2
+        protected final fun <get-inObject>(): kotlin.Int
+}
+
+public final class B {
+    /*primary*/ public constructor B()
+
+    public companion object Companion {
+        /*primary*/ private constructor Companion()
+        public const final val inCompanion: kotlin.Int = 3
+            public final fun <get-inCompanion>(): kotlin.Int
+    }
+}

compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java

@@ -4471,6 +4471,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTestCompiledKotlin(fileName);
             }
 
+            @TestMetadata("Const.kt")
+            public void testConst() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt");
+                doTestCompiledKotlin(fileName);
+            }
+
             @TestMetadata("Constants.kt")
             public void testConstants() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");

compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java

@@ -2580,6 +2580,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
                 doTest(fileName);
             }
 
+            @TestMetadata("Const.kt")
+            public void testConst() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("Constants.kt")
             public void testConstants() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");