Fix ConstantValue-related testData for loadJava tests

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt

@@ -4,7 +4,7 @@ package test
 class A {
     class B {
         companion object {
-            val TEST = 1
+            val TEST = { 1 }()
         }
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt

@@ -8,7 +8,7 @@ public final class A {
 
         public companion object Companion {
             /*primary*/ private constructor Companion()
-            public final val TEST: kotlin.Int = 1
+            public final val TEST: kotlin.Int
                 public final fun <get-TEST>(): kotlin.Int
         }
     }

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt

@@ -7,4 +7,4 @@ annotation class Anno(val t: ElementType)
 
 @Anno(ElementType.METHOD) fun foo() {}
 
-@field:Anno(ElementType.FIELD) val bar = 42
+@field:Anno(ElementType.FIELD) val bar = { 42 }()

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt

@@ -1,6 +1,6 @@
 package test
 
-@field:test.Anno(t = ElementType.FIELD) public val bar: kotlin.Int = 42
+@field:test.Anno(t = ElementType.FIELD) public val bar: kotlin.Int
     public fun <get-bar>(): kotlin.Int
 @test.Anno(t = ElementType.METHOD) public fun foo(): kotlin.Unit
 

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt

@@ -7,6 +7,6 @@ annotation class Anno(vararg val t: ElementType)
 
 @Anno(ElementType.METHOD, ElementType.FIELD) fun foo() {}
 
-@field:Anno(ElementType.PACKAGE) val bar = 42
+@field:Anno(ElementType.PACKAGE) val bar = { 42 }()
 
 @Anno() fun baz() {}

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt

@@ -1,6 +1,6 @@
 package test
 
-@field:test.Anno(t = {ElementType.PACKAGE}) public val bar: kotlin.Int = 42
+@field:test.Anno(t = {ElementType.PACKAGE}) public val bar: kotlin.Int
     public fun <get-bar>(): kotlin.Int
 @test.Anno(t = {}) public fun baz(): kotlin.Unit
 @test.Anno(t = {ElementType.METHOD, ElementType.FIELD}) public fun foo(): kotlin.Unit

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt

@@ -5,6 +5,6 @@ annotation class Anno(vararg val t: String)
 
 @Anno("live", "long") fun foo() {}
 
-@field:Anno("prosper") val bar = 42
+@field:Anno("prosper") val bar = { 42 }()
 
 @Anno() fun baz() {}

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt

@@ -1,6 +1,6 @@
 package test
 
-@field:test.Anno(t = {"prosper"}) public val bar: kotlin.Int = 42
+@field:test.Anno(t = {"prosper"}) public val bar: kotlin.Int
     public fun <get-bar>(): kotlin.Int
 @test.Anno(t = {}) public fun baz(): kotlin.Unit
 @test.Anno(t = {"live", "long"}) public fun foo(): kotlin.Unit

compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt

@@ -11,7 +11,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
 
 class ConstructorTypeParamClassObjectConflict<test> {
     companion object {
-        val test = 12
+        val test = { 12 }()
     }
 
     val some = test
@@ -19,7 +19,7 @@ class ConstructorTypeParamClassObjectConflict<test> {
 
 class TestConstructorParamClassObjectConflict(test: String) {
     companion object {
-        val test = 12
+        val test = { 12 }()
     }
 
     val some = test
@@ -28,7 +28,7 @@ class TestConstructorParamClassObjectConflict(test: String) {
 
 class TestConstructorValClassObjectConflict(val test: String) {
     companion object {
-        val test = 12
+        val test = { 12 }()
     }
 
     val some = test
@@ -36,10 +36,10 @@ class TestConstructorValClassObjectConflict(val test: String) {
 
 class TestClassObjectAndClassConflict {
     companion object {
-        val bla = 12
+        val bla = { 12 }()
     }
 
-    val bla = "More"
+    val bla = { "More" }()
 
     val some = bla
 }

compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt

@@ -2,12 +2,12 @@ package test
 
 public final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
     /*primary*/ public constructor ConstructorTypeParamClassObjectConflict</*0*/ test>()
-    public final val some: kotlin.Int = 12
+    public final val some: kotlin.Int
         public final fun <get-some>(): kotlin.Int
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val test: kotlin.Int = 12
+        public final val test: kotlin.Int
             public final fun <get-test>(): kotlin.Int
     }
 }
@@ -27,14 +27,14 @@ public final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
 
 public final class TestClassObjectAndClassConflict {
     /*primary*/ public constructor TestClassObjectAndClassConflict()
-    public final val bla: kotlin.String = "More"
+    public final val bla: kotlin.String
         public final fun <get-bla>(): kotlin.String
-    public final val some: kotlin.String = "More"
+    public final val some: kotlin.String
         public final fun <get-some>(): kotlin.String
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val bla: kotlin.Int = 12
+        public final val bla: kotlin.Int
             public final fun <get-bla>(): kotlin.Int
     }
 }
@@ -46,7 +46,7 @@ public final class TestConstructorParamClassObjectConflict {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val test: kotlin.Int = 12
+        public final val test: kotlin.Int
             public final fun <get-test>(): kotlin.Int
     }
 }
@@ -60,7 +60,7 @@ public final class TestConstructorValClassObjectConflict {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val test: kotlin.Int = 12
+        public final val test: kotlin.Int
             public final fun <get-test>(): kotlin.Int
     }
 }

compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt

@@ -2,6 +2,6 @@
 package test
 
 public object Obj {
-    public val v: String = "val"
+    public val v: String = { "val" }()
     public fun f(): String = "fun"
 }

compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt

@@ -2,7 +2,7 @@ package test
 
 public object Obj {
     /*primary*/ private constructor Obj()
-    public final val v: kotlin.String = "val"
+    public final val v: kotlin.String
         public final fun <get-v>(): kotlin.String
     public final fun f(): kotlin.String
 }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt

@@ -3,7 +3,7 @@ package test
 
 public class Outer {
       public object Obj {
-          public val v: String = "val"
+          public val v: String = { "val" }()
           public fun f(): String = "fun"
       }
 }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt

@@ -5,7 +5,7 @@ public final class Outer {
 
     public object Obj {
         /*primary*/ private constructor Obj()
-        public final val v: kotlin.String = "val"
+        public final val v: kotlin.String
             public final fun <get-v>(): kotlin.String
         public final fun f(): kotlin.String
     }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt

@@ -4,7 +4,7 @@ package test
 public class Outer {
     public companion object {
         public object Obj {
-            public val v: String = "val"
+            public val v: String = { "val" }()
             public fun f(): String = "fun"
         }
     }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt

@@ -8,7 +8,7 @@ public final class Outer {
 
         public object Obj {
             /*primary*/ private constructor Obj()
-            public final val v: kotlin.String = "val"
+            public final val v: kotlin.String
                 public final fun <get-v>(): kotlin.String
             public final fun f(): kotlin.String
         }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt

@@ -3,7 +3,7 @@ package test
 
 public object Outer {
     public object Obj {
-        public val v: String = "val"
+        public val v: String = { "val" }()
         public fun f(): String = "fun"
     }
 }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt

@@ -5,7 +5,7 @@ public object Outer {
 
     public object Obj {
         /*primary*/ private constructor Obj()
-        public final val v: kotlin.String = "val"
+        public final val v: kotlin.String
             public final fun <get-v>(): kotlin.String
         public final fun f(): kotlin.String
     }

compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt

@@ -2,8 +2,8 @@
 package test
 
 public object Obj {
-    public val v: String = "val"
+    public val v: String = { "val" }()
     public fun f(): String = "fun"
 }
 
-val x = 5
+val x = { 5 }()

compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt

@@ -1,11 +1,11 @@
 package test
 
-public val x: kotlin.Int = 5
+public val x: kotlin.Int
     public fun <get-x>(): kotlin.Int
 
 public object Obj {
     /*primary*/ private constructor Obj()
-    public final val v: kotlin.String = "val"
+    public final val v: kotlin.String
         public final fun <get-v>(): kotlin.String
     public final fun f(): kotlin.String
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt

@@ -3,6 +3,6 @@ package test
 
 class ClassObjectDeclaresProperty {
     companion object {
-        val i = 1
+        val i = { 1 }()
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt

@@ -5,7 +5,7 @@ public final class ClassObjectDeclaresProperty {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val i: kotlin.Int = 1
+        public final val i: kotlin.Int
             public final fun <get-i>(): kotlin.Int
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt

@@ -3,7 +3,7 @@ package test
 
 class A {
   companion object {
-    val some = 1
+    val some = { 1 }()
   }
 
   val other = some

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt

@@ -2,12 +2,12 @@ package test
 
 public final class A {
     /*primary*/ public constructor A()
-    public final val other: kotlin.Int = 1
+    public final val other: kotlin.Int
         public final fun <get-other>(): kotlin.Int
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val some: kotlin.Int = 1
+        public final val some: kotlin.Int
             public final fun <get-some>(): kotlin.Int
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt

@@ -5,27 +5,29 @@ class Test {
 
     companion object {
 
-        public val prop1 : Int = 10
+        public val prop1 : Int = { 10 }()
 
-        public var  prop2 : Int = 11
+        public var  prop2 : Int = { 11 }()
             protected set
 
-        public val prop3: Int = 12
+        public val prop3: Int = { 12 }()
             get() {
                 return field
             }
 
-        var prop4 : Int = 13
+        var prop4 : Int = { 13 }()
 
         fun incProp4() {
             prop4++
         }
 
-        public var prop5 : Int = 14
+        public var prop5 : Int = { 14 }()
 
-        public var prop7 : Int = 20
+        public var prop7 : Int = { 20 }()
             set(i: Int) {
                 field++
             }
+
+        public const val constProp8: Int = 80
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt

@@ -5,12 +5,14 @@ public final class Test {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val prop1: kotlin.Int = 10
+        public const final val constProp8: kotlin.Int = 80
+            public final fun <get-constProp8>(): kotlin.Int
+        public final val prop1: kotlin.Int
             public final fun <get-prop1>(): kotlin.Int
         public final var prop2: kotlin.Int
             public final fun <get-prop2>(): kotlin.Int
             protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
-        public final val prop3: kotlin.Int = 12
+        public final val prop3: kotlin.Int
             public final fun <get-prop3>(): kotlin.Int
         public final var prop4: kotlin.Int
             public final fun <get-prop4>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt

@@ -5,27 +5,29 @@ interface Test {
 
     companion object {
 
-        public val prop1 : Int = 10
+        public val prop1 : Int = { 10 }()
 
-        public var  prop2 : Int = 11
+        public var  prop2 : Int = { 11 }()
             protected set
 
-        public val prop3: Int = 12
+        public val prop3: Int = { 12 }()
             get() {
                 return field
             }
 
-        var prop4 : Int = 13
+        var prop4 : Int = { 13 }()
 
         fun incProp4() {
             prop4++
         }
 
-        public var prop5 : Int = 14
+        public var prop5 : Int = { 14 }()
 
-        public var prop7 : Int = 20
+        public var prop7 : Int = { 20 }()
             set(i: Int) {
                 field++
             }
+
+        public const val constProp8: Int = 80
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt

@@ -4,12 +4,14 @@ public interface Test {
 
     public companion object Companion {
         /*primary*/ private constructor Companion()
-        public final val prop1: kotlin.Int = 10
+        public const final val constProp8: kotlin.Int = 80
+            public final fun <get-constProp8>(): kotlin.Int
+        public final val prop1: kotlin.Int
             public final fun <get-prop1>(): kotlin.Int
         public final var prop2: kotlin.Int
             public final fun <get-prop2>(): kotlin.Int
             protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
-        public final val prop3: kotlin.Int = 12
+        public final val prop3: kotlin.Int
             public final fun <get-prop3>(): kotlin.Int
         public final var prop4: kotlin.Int
             public final fun <get-prop4>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt

@@ -10,7 +10,7 @@ enum class Enum {
 
     interface Trait
 
-    val c: Int = 1
+    val c: Int = { 1 }()
 
     fun f(): Int = 2
 }

compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt

@@ -6,7 +6,7 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
     enum entry ENTRY2
 
     /*primary*/ private constructor Enum()
-    public final val c: kotlin.Int = 1
+    public final val c: kotlin.Int
         public final fun <get-c>(): kotlin.Int
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
         public final override /*1*/ /*fake_override*/ fun <get-name>(): kotlin.String

compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt

@@ -1,6 +1,6 @@
 package test
 
 public class ClassWithConstVal() {
-    public val f: Int = 1
+    public val f: Int = { 1 }()
     public val f2: Int = f
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.txt

@@ -2,8 +2,8 @@ package test
 
 public final class ClassWithConstVal {
     /*primary*/ public constructor ClassWithConstVal()
-    public final val f: kotlin.Int = 1
+    public final val f: kotlin.Int
         public final fun <get-f>(): kotlin.Int
-    public final val f2: kotlin.Int = 1
+    public final val f2: kotlin.Int
         public final fun <get-f2>(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt

@@ -2,5 +2,5 @@
 package test
 
 public class FinalFieldAsVal() {
-    public val f: Int = 1
+    public val f: Int = { 1 }()
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.txt

@@ -2,6 +2,6 @@ package test
 
 public final class FinalFieldAsVal {
     /*primary*/ public constructor FinalFieldAsVal()
-    public final val f: kotlin.Int = 1
+    public final val f: kotlin.Int
         public final fun <get-f>(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt

@@ -4,6 +4,6 @@ package test
 import java.util.*
 
 public open class WrongFieldMutability {
-    public var fooNotFinal : String? = ""
+    public var fooNotFinal : String? = { "" }()
-    public val fooFinal : String? = "Test"
+    public val fooFinal : String? = { "Test" }()
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt

@@ -2,7 +2,7 @@ package test
 
 public open class WrongFieldMutability {
     /*primary*/ public constructor WrongFieldMutability()
-    public final val fooFinal: kotlin.String? = "Test"
+    public final val fooFinal: kotlin.String?
         public final fun <get-fooFinal>(): kotlin.String?
     public final var fooNotFinal: kotlin.String?
         public final fun <get-fooNotFinal>(): kotlin.String?

compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt

@@ -1,16 +1,16 @@
 //ALLOW_AST_ACCESS
 package test
 
-val a = 0
+val a = { 0 }()
-val c = 0
+val c = { 0 }()
 
 fun a() = 0
 fun b() = 0
 fun c() = 0
 
 class A {
-    val a = 0
+    val a = { 0 }()
-    val c = 0
+    val c = { 0 }()
 
     fun a() = 0
     fun b() = 0

compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.txt

@@ -1,8 +1,8 @@
 package test
 
-public val a: kotlin.Int = 0
+public val a: kotlin.Int
     public fun <get-a>(): kotlin.Int
-public val c: kotlin.Int = 0
+public val c: kotlin.Int
     public fun <get-c>(): kotlin.Int
 public fun a(): kotlin.Int
 public fun b(): kotlin.Int
@@ -10,9 +10,9 @@ public fun c(): kotlin.Int
 
 public final class A {
     /*primary*/ public constructor A()
-    public final val a: kotlin.Int = 0
+    public final val a: kotlin.Int
         public final fun <get-a>(): kotlin.Int
-    public final val c: kotlin.Int = 0
+    public final val c: kotlin.Int
         public final fun <get-c>(): kotlin.Int
     public final fun a(): kotlin.Int
     public final fun b(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt

@@ -14,9 +14,9 @@ class A {
     val Int.c: Int
         get() = 1
 
-    val c: Int = 2
+    val c: Int = { 2 }()
 
-    val d: Int = 2
+    val d: Int = { 2 }()
 
     val Int.d: Int
         get() = 1

compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.txt

@@ -2,9 +2,9 @@ package test
 
 public final class A {
     /*primary*/ public constructor A()
-    public final val c: kotlin.Int = 2
+    public final val c: kotlin.Int
         public final fun <get-c>(): kotlin.Int
-    public final val d: kotlin.Int = 2
+    public final val d: kotlin.Int
         public final fun <get-d>(): kotlin.Int
     public final val kotlin.Int.c: kotlin.Int
         public final fun kotlin.Int.<get-c>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt

@@ -2,8 +2,8 @@
 package test
 
 class A {
-    val a: Int = 3
+    val a: Int = { 3 }()
-    val c: Int = 3
+    val c: Int = { 3 }()
     val Int.a: Int get() = 3
     val Int.b: Int get() = 4
     val Int.c: Int get() = 4

compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.txt

@@ -2,9 +2,9 @@ package test
 
 public final class A {
     /*primary*/ public constructor A()
-    public final val a: kotlin.Int = 3
+    public final val a: kotlin.Int
         public final fun <get-a>(): kotlin.Int
-    public final val c: kotlin.Int = 3
+    public final val c: kotlin.Int
         public final fun <get-c>(): kotlin.Int
     public final val kotlin.Int.a: kotlin.Int
         public final fun kotlin.Int.<get-a>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt

@@ -1,9 +1,9 @@
 //ALLOW_AST_ACCESS
 package test
 
-val f1 = 1
+val f1 = { 1 }()
 fun f2() = 1
-val f3 = 1
+val f3 = { 1 }()
 fun f4() = 1
 fun f4(i: Int) = 1
-val f5 = 1
+val f5 = { 1 }()

compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.txt

@@ -1,10 +1,10 @@
 package test
 
-public val f1: kotlin.Int = 1
+public val f1: kotlin.Int
     public fun <get-f1>(): kotlin.Int
-public val f3: kotlin.Int = 1
+public val f3: kotlin.Int
     public fun <get-f3>(): kotlin.Int
-public val f5: kotlin.Int = 1
+public val f5: kotlin.Int
     public fun <get-f5>(): kotlin.Int
 public fun f2(): kotlin.Int
 public fun f4(): kotlin.Int

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

@@ -2,5 +2,5 @@
 package test
 
 class ClassVal() {
-    val aa = 1
+    val aa = { 1 }()
 }

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

@@ -2,6 +2,6 @@ package test
 
 public final class ClassVal {
     /*primary*/ public constructor ClassVal()
-    public final val aa: kotlin.Int = 1
+    public final val aa: kotlin.Int
         public final fun <get-aa>(): kotlin.Int
 }

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

@@ -1,19 +1,18 @@
 //ALLOW_AST_ACCESS
 package test
 
-val b: Byte = 100
+const val b: Byte = 100
-val b1: Byte = 1
+const val b1: Byte = 1
-val s: Short = 20000
+const val s: Short = 20000
-val s1: Short = 1
+const val s1: Short = 1
-val i: Int = 2000000
+const val i: Int = 2000000
-val i1: Short = 1
+const val i1: Short = 1
-val l: Long = 2000000000000L
+const val l: Long = 2000000000000L
-val l1: Long = 1
+const val l1: Long = 1
-val f: Float = 3.14f
+const val f: Float = 3.14f
-val d: Double = 3.14
+const val d: Double = 3.14
-val bb: Boolean = true
+const val bb: Boolean = true
-val c: Char = '\u03c0' // pi symbol
+const val c: Char = '\u03c0' // pi symbol
-val MAX_HIGH_SURROGATE: Char = '\uDBFF'
+const val MAX_HIGH_SURROGATE: Char = '\uDBFF'
-val nl = '\n'
+const val nl = '\n'
-
+const val str: String = ":)"
-val str: String = ":)"

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

@@ -1,32 +1,32 @@
 package test
 
-public val MAX_HIGH_SURROGATE: kotlin.Char = \uDBFF ('?')
+public const val MAX_HIGH_SURROGATE: kotlin.Char = \uDBFF ('?')
     public fun <get-MAX_HIGH_SURROGATE>(): kotlin.Char
-public val b: kotlin.Byte = 100.toByte()
+public const val b: kotlin.Byte = 100.toByte()
     public fun <get-b>(): kotlin.Byte
-public val b1: kotlin.Byte = 1.toByte()
+public const val b1: kotlin.Byte = 1.toByte()
     public fun <get-b1>(): kotlin.Byte
-public val bb: kotlin.Boolean = true
+public const val bb: kotlin.Boolean = true
     public fun <get-bb>(): kotlin.Boolean
-public val c: kotlin.Char = \u03C0 ('π')
+public const val c: kotlin.Char = \u03C0 ('π')
     public fun <get-c>(): kotlin.Char
-public val d: kotlin.Double = 3.14.toDouble()
+public const val d: kotlin.Double = 3.14.toDouble()
     public fun <get-d>(): kotlin.Double
-public val f: kotlin.Float = 3.14.toFloat()
+public const val f: kotlin.Float = 3.14.toFloat()
     public fun <get-f>(): kotlin.Float
-public val i: kotlin.Int = 2000000
+public const val i: kotlin.Int = 2000000
     public fun <get-i>(): kotlin.Int
-public val i1: kotlin.Short = 1.toShort()
+public const val i1: kotlin.Short = 1.toShort()
     public fun <get-i1>(): kotlin.Short
-public val l: kotlin.Long = 2000000000000.toLong()
+public const val l: kotlin.Long = 2000000000000.toLong()
     public fun <get-l>(): kotlin.Long
-public val l1: kotlin.Long = 1.toLong()
+public const val l1: kotlin.Long = 1.toLong()
     public fun <get-l1>(): kotlin.Long
-public val nl: kotlin.Char = \u000A ('\n')
+public const val nl: kotlin.Char = \u000A ('\n')
     public fun <get-nl>(): kotlin.Char
-public val s: kotlin.Short = 20000.toShort()
+public const val s: kotlin.Short = 20000.toShort()
     public fun <get-s>(): kotlin.Short
-public val s1: kotlin.Short = 1.toShort()
+public const val s1: kotlin.Short = 1.toShort()
     public fun <get-s1>(): kotlin.Short
-public val str: kotlin.String = ":)"
+public const val str: kotlin.String = ":)"
     public fun <get-str>(): kotlin.String

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

@@ -1,4 +1,4 @@
 //ALLOW_AST_ACCESS
 package test
 
-val nsVal = 1
+val nsVal = { 1 }()

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

@@ -1,4 +1,4 @@
 package test
 
-public val nsVal: kotlin.Int = 1
+public val nsVal: kotlin.Int
     public fun <get-nsVal>(): kotlin.Int

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

@@ -2,9 +2,9 @@
 package test
 
 open class BaseClass() {
-    open val shape = "square"
+    open val shape = { "square" }()
 }
 
 open class Subclass() : BaseClass() {
-    override open val shape = "circle"
+    override open val shape = { "circle" }()
 }

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

@@ -2,12 +2,12 @@ package test
 
 public open class BaseClass {
     /*primary*/ public constructor BaseClass()
-    public open val shape: kotlin.String = "square"
+    public open val shape: kotlin.String
         public open fun <get-shape>(): kotlin.String
 }
 
 public open class Subclass : test.BaseClass {
     /*primary*/ public constructor Subclass()
-    public open override /*1*/ val shape: kotlin.String = "circle"
+    public open override /*1*/ val shape: kotlin.String
         public open override /*1*/ fun <get-shape>(): kotlin.String
 }

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

@@ -6,5 +6,5 @@ interface Trait {
 }
 
 open class Subclass() : Trait {
-    override open val shape = "circle"
+    override open val shape = { "circle" }()
 }

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

@@ -2,7 +2,7 @@ package test
 
 public open class Subclass : test.Trait {
     /*primary*/ public constructor Subclass()
-    public open override /*1*/ val shape: kotlin.String = "circle"
+    public open override /*1*/ val shape: kotlin.String
         public open override /*1*/ fun <get-shape>(): kotlin.String
 }
 

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

@@ -2,7 +2,7 @@
 package test
 
 open class BaseClass() {
-    val exactly = 17
+    val exactly = { 17 }()
 }
 
 class Subclass() : BaseClass() {

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

@@ -2,7 +2,7 @@ package test
 
 public open class BaseClass {
     /*primary*/ public constructor BaseClass()
-    public final val exactly: kotlin.Int = 17
+    public final val exactly: kotlin.Int
         public final fun <get-exactly>(): kotlin.Int
 }
 

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt

@@ -2,13 +2,13 @@
 package test
 
 class ClassVal() {
-    val property1 = 1
+    val property1 = { 1 }()
 
-    internal val property2 = 1
+    internal val property2 = { 1 }()
 
     private val property3 = Object()
 
-    protected val property4: String = ""
+    protected val property4: String = { "" }()
 
-    public val property5: Int = 1
+    public val property5: Int = { 1 }()
 }

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt

@@ -2,14 +2,14 @@ package test
 
 public final class ClassVal {
     /*primary*/ public constructor ClassVal()
-    public final val property1: kotlin.Int = 1
+    public final val property1: kotlin.Int
         public final fun <get-property1>(): kotlin.Int
-    internal final val property2: kotlin.Int = 1
+    internal final val property2: kotlin.Int
         internal final fun <get-property2>(): kotlin.Int
     private final val property3: java.lang.Object
         private final fun <get-property3>(): java.lang.Object
-    protected final val property4: kotlin.String = ""
+    protected final val property4: kotlin.String
         protected final fun <get-property4>(): kotlin.String
-    public final val property5: kotlin.Int = 1
+    public final val property5: kotlin.Int
         public final fun <get-property5>(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt

@@ -2,19 +2,19 @@
 package test
 
 class ClassVal() {
-    val property1 = 1
+    val property1 = { 1 }()
       get
 
-    internal val property2 = 1
+    internal val property2 = { 1 }()
       get
 
     private val property3 = Object()
       get
 
-    protected val property4: String = ""
+    protected val property4: String = { "" }()
       get
 
-    public val property5: Int = 1
+    public val property5: Int = { 1 }()
       get
 }
 

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt

@@ -2,14 +2,14 @@ package test
 
 public final class ClassVal {
     /*primary*/ public constructor ClassVal()
-    public final val property1: kotlin.Int = 1
+    public final val property1: kotlin.Int
         public final fun <get-property1>(): kotlin.Int
-    internal final val property2: kotlin.Int = 1
+    internal final val property2: kotlin.Int
         internal final fun <get-property2>(): kotlin.Int
     private final val property3: java.lang.Object
         private final fun <get-property3>(): java.lang.Object
-    protected final val property4: kotlin.String = ""
+    protected final val property4: kotlin.String
         protected final fun <get-property4>(): kotlin.String
-    public final val property5: kotlin.Int = 1
+    public final val property5: kotlin.Int
         public final fun <get-property5>(): kotlin.Int
 }

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

@@ -0,0 +1,19 @@
+// !LANGUAGE: -NoConstantValueAttributeForNonConstVals
+//ALLOW_AST_ACCESS
+
+package test
+val nonConstVal1 = 1
+
+class C {
+    val nonConstVal2 = 2
+
+    companion object {
+        val nonConstVal3 = 3
+    }
+}
+
+interface I {
+    companion object {
+        val nonConstVal4 = 4
+    }
+}

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

@@ -0,0 +1,25 @@
+package test
+
+public val nonConstVal1: kotlin.Int = 1
+    public fun <get-nonConstVal1>(): kotlin.Int
+
+public final class C {
+    /*primary*/ public constructor C()
+    public final val nonConstVal2: kotlin.Int = 2
+        public final fun <get-nonConstVal2>(): kotlin.Int
+
+    public companion object Companion {
+        /*primary*/ private constructor Companion()
+        public final val nonConstVal3: kotlin.Int = 3
+            public final fun <get-nonConstVal3>(): kotlin.Int
+    }
+}
+
+public interface I {
+
+    public companion object Companion {
+        /*primary*/ private constructor Companion()
+        public final val nonConstVal4: kotlin.Int = 4
+            public final fun <get-nonConstVal4>(): kotlin.Int
+    }
+}

compiler/testData/loadJava/compiledKotlin/typealias/Basic.kt

@@ -5,10 +5,10 @@ typealias S = String
 typealias SS = S
 typealias SSS = SS
 
-val x1: S = ""
+val x1: S = { "" }()
-val x2: SS = ""
+val x2: SS = { "" }()
-val x3: SSS = ""
+val x3: SSS = { "" }()
 
-val x4: S? = ""
+val x4: S? = { "" }()
-val x5: SS? = ""
+val x5: SS? = { "" }()
-val x6: SSS? = ""
+val x6: SSS? = { "" }()

compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt

@@ -1,16 +1,16 @@
 package test
 
-public val x1: test.S /* = kotlin.String */ = ""
+public val x1: test.S /* = kotlin.String */
     public fun <get-x1>(): test.S /* = kotlin.String */
-public val x2: test.SS /* = kotlin.String */ = ""
+public val x2: test.SS /* = kotlin.String */
     public fun <get-x2>(): test.SS /* = kotlin.String */
-public val x3: test.SSS /* = kotlin.String */ = ""
+public val x3: test.SSS /* = kotlin.String */
     public fun <get-x3>(): test.SSS /* = kotlin.String */
-public val x4: test.S? /* = kotlin.String? */ = ""
+public val x4: test.S? /* = kotlin.String? */
     public fun <get-x4>(): test.S? /* = kotlin.String? */
-public val x5: test.SS? /* = kotlin.String? */ = ""
+public val x5: test.SS? /* = kotlin.String? */
     public fun <get-x5>(): test.SS? /* = kotlin.String? */
-public val x6: test.SSS? /* = kotlin.String? */ = ""
+public val x6: test.SSS? /* = kotlin.String? */
     public fun <get-x6>(): test.SSS? /* = kotlin.String? */
 public typealias S = kotlin.String
 public typealias SS = test.S

compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt

@@ -1,5 +1,5 @@
 //ALLOW_AST_ACCESS
 package test
 
-internal val x = 0
+internal val x = { 0 }()
-internal fun f() = 0
+internal fun f() = { 0 }()

compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt

@@ -1,5 +1,5 @@
 package test
 
-internal val x: kotlin.Int = 0
+internal val x: kotlin.Int
     internal fun <get-x>(): kotlin.Int
 internal fun f(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt

@@ -3,12 +3,12 @@
 package test
 
 public class PrivateClassMembers {
-    private val v = 0
+    private val v = { 0 }()
 
-    private var r = 0
+    private var r = { 0 }()
         private set
 
-    private fun f() = 0
+    private fun f() = { 0 }()
 
-    internal val internal = 0
+    internal val internal = { 0 }()
 }

compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.txt

@@ -2,12 +2,12 @@ package test
 
 public final class PrivateClassMembers {
     /*primary*/ public constructor PrivateClassMembers()
-    internal final val internal: kotlin.Int = 0
+    internal final val internal: kotlin.Int
         internal final fun <get-internal>(): kotlin.Int
     private final var r: kotlin.Int
         private final fun <get-r>(): kotlin.Int
         private final fun <set-r>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
-    private final val v: kotlin.Int = 0
+    private final val v: kotlin.Int
         private final fun <get-v>(): kotlin.Int
     private final fun f(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt

@@ -1,4 +1,4 @@
 //ALLOW_AST_ACCESS
 package test
 
-private val topLevelVal = 0
+private val topLevelVal = { 0 }()

compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt

@@ -1,4 +1,4 @@
 package test
 
-private val topLevelVal: kotlin.Int = 0
+private val topLevelVal: kotlin.Int
     private fun <get-topLevelVal>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt

@@ -3,9 +3,9 @@
 package test
 
 open class Base {
-    protected open val prot: Int = 1
+    protected open val prot: Int = { 1 }()
-    internal open val int = 1
+    internal open val int = { 1 }()
-    public open val pub: Int = 1
+    public open val pub: Int = { 1 }()
 }
 
 class Child(

compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.txt

@@ -2,11 +2,11 @@ package test
 
 public open class Base {
     /*primary*/ public constructor Base()
-    internal open val int: kotlin.Int = 1
+    internal open val int: kotlin.Int
         internal open fun <get-int>(): kotlin.Int
-    protected open val prot: kotlin.Int = 1
+    protected open val prot: kotlin.Int
         protected open fun <get-prot>(): kotlin.Int
-    public open val pub: kotlin.Int = 1
+    public open val pub: kotlin.Int
         public open fun <get-pub>(): kotlin.Int
 }
 

compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt

@@ -3,9 +3,9 @@
 package test
 
 open class Base {
-    protected open val prot: Int = 1
+    protected open val prot: Int = { 1 }()
-    internal open val int: Int = 1
+    internal open val int: Int = { 1 }()
-    public open val pub: Int = 1
+    public open val pub: Int = { 1 }()
 }
 
 class Child(

compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt

@@ -2,11 +2,11 @@ package test
 
 public open class Base {
     /*primary*/ public constructor Base()
-    internal open val int: kotlin.Int = 1
+    internal open val int: kotlin.Int
         internal open fun <get-int>(): kotlin.Int
-    protected open val prot: kotlin.Int = 1
+    protected open val prot: kotlin.Int
         protected open fun <get-prot>(): kotlin.Int
-    public open val pub: kotlin.Int = 1
+    public open val pub: kotlin.Int
         public open fun <get-pub>(): kotlin.Int
 }
 

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

@@ -4150,6 +4150,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 runTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
             }
 
+            @TestMetadata("nonConstValWithConstantValueAttribute.kt")
+            public void testNonConstValWithConstantValueAttribute() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt");
+            }
+
             @TestMetadata("NsVal.kt")
             public void testNsVal() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");

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

@@ -2494,6 +2494,11 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
             runTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
         }
 
+        @TestMetadata("nonConstValWithConstantValueAttribute.kt")
+        public void testNonConstValWithConstantValueAttribute() throws Exception {
+            runTest("compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt");
+        }
+
         @TestMetadata("NsVal.kt")
         public void testNsVal() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");

compiler/tests/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java

@@ -4150,6 +4150,11 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
                 runTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
             }
 
+            @TestMetadata("nonConstValWithConstantValueAttribute.kt")
+            public void testNonConstValWithConstantValueAttribute() throws Exception {
+                runTest("compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt");
+            }
+
             @TestMetadata("NsVal.kt")
             public void testNsVal() throws Exception {
                 runTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");

idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/LoadJavaClsStubTestGenerated.java

@@ -2494,6 +2494,11 @@ public class LoadJavaClsStubTestGenerated extends AbstractLoadJavaClsStubTest {
             runTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
         }
 
+        @TestMetadata("nonConstValWithConstantValueAttribute.kt")
+        public void testNonConstValWithConstantValueAttribute() throws Exception {
+            runTest("compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt");
+        }
+
         @TestMetadata("NsVal.kt")
         public void testNsVal() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");

idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java

@@ -2494,6 +2494,11 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest {
             runTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
         }
 
+        @TestMetadata("nonConstValWithConstantValueAttribute.kt")
+        public void testNonConstValWithConstantValueAttribute() throws Exception {
+            runTest("compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt");
+        }
+
         @TestMetadata("NsVal.kt")
         public void testNsVal() throws Exception {
             runTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");