Private visibility for non-const, non-jvmField class companion property backing field

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt

@@ -11,13 +11,13 @@ annotation class AFloat(val value: Float)
 class Test {
 
     companion object {
-        val vstring: String = "Test"
-        val vchar: Char = 'c'
-        val vint: Int = 10
-        val vbyte: Byte = 11
-        val vlong: Long = 12
-        val vdouble: Double = 1.2
-        val vfloat: Float = 1.3.toFloat()
+        const val vstring: String = "Test"
+        const val vchar: Char = 'c'
+        const val vint: Int = 10
+        const val vbyte: Byte = 11
+        const val vlong: Long = 12
+        const val vdouble: Double = 1.2
+        const val vfloat: Float = 1.3.toFloat()
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.txt

@@ -44,12 +44,12 @@ public final class Test {
 
     public companion object Companion {
         private constructor Companion()
-        public final val vbyte: kotlin.Byte
-        public final val vchar: kotlin.Char
-        public final val vdouble: kotlin.Double
-        public final val vfloat: kotlin.Float
-        public final val vint: kotlin.Int
-        public final val vlong: kotlin.Long
-        public final val vstring: kotlin.String
+        public const final val vbyte: kotlin.Byte
+        public const final val vchar: kotlin.Char
+        public const final val vdouble: kotlin.Double
+        public const final val vfloat: kotlin.Float
+        public const final val vint: kotlin.Int
+        public const final val vlong: kotlin.Long
+        public const final val vstring: kotlin.String
     }
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt

@@ -2,6 +2,6 @@ package test
 
 class KotlinClass {
     companion object {
-        val FOO: Int = 10
+        const val FOO: Int = 10
     }
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.txt

@@ -5,7 +5,7 @@ public final class KotlinClass {
 
     public companion object Companion {
         private constructor Companion()
-        public final val FOO: kotlin.Int
+        public const final val FOO: kotlin.Int
     }
 }
 

compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt

@@ -3,9 +3,9 @@ package test
 class Test {
 
   companion object {
-    public val valProp: Int = 10
+    public const val valProp: Int = 10
 
-    public var varProp: Int = 10
+    @JvmField public var varProp: Int = 10
   }
 
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.txt

@@ -5,8 +5,8 @@ public final class Test {
 
     public companion object Companion {
         private constructor Companion()
-        public final val valProp: kotlin.Int
-        public final var varProp: kotlin.Int
+        public const final val valProp: kotlin.Int
+        @field:kotlin.jvm.JvmField() public final var varProp: kotlin.Int
     }
 }