Move fields and init blocks of companions to their owners

compiler/testData/codegen/box/jvmField/initializersOrder.kt

@@ -0,0 +1,36 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+
+import kotlin.test.assertEquals
+
+class WithCompanion {
+    companion object {
+        var a = 0
+        init {
+            a++
+        }
+        @JvmField var b = a
+        init {
+            b++
+        }
+        val c = b
+    }
+}
+
+object Object {
+    var a = 0
+    init {
+        a++
+    }
+    @JvmField var b = a
+    init {
+        b++
+    }
+    val c = b
+}
+
+fun box(): String {
+    assertEquals<Int>(2, WithCompanion.c, "Field WithCompanion.c")
+    assertEquals<Int>(2, Object.c, "Field Object")
+    return "OK"
+}

compiler/testData/codegen/box/jvmField/interfaceCompanionWithJava.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +JvmFieldInInterface
-// IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME

compiler/testData/codegen/box/jvmField/publicFieldJava.kt

@@ -0,0 +1,43 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+
+// FILE: Test.java
+
+public class Test {
+    public static String getField()
+    {
+        return new A().field;
+    }
+    public static String getCField()
+    {
+        return A.cfield;
+    }
+    public static String getObjectField()
+    {
+        return Object.field;
+    }
+}
+
+// FILE: publicFieldJava.kt
+
+class A {
+    @JvmField public val field = "OK";
+
+    companion object {
+        @JvmField public val cfield = "OK";
+    }
+}
+
+object Object {
+    @JvmField public val field = "OK";
+}
+
+
+fun box(): String {
+    if (Test.getField() != "OK") return "fail 1: ${Test.getField()}"
+    if (Test.getCField() != "OK") return "fail 2: ${Test.getCField()}"
+    if (Test.getObjectField() != "OK") return "fail 3: ${Test.getObjectField()}"
+
+    return "OK"
+
+}

compiler/testData/codegen/box/jvmStatic/enumCompanion.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 
 object O {
     val mmmap = HashMap<String, Int>();

compiler/testData/codegen/box/objects/objectInitialization_kt5523.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 object A {
     val a = "OK"
     val b = A.a

compiler/testData/codegen/box/objects/privateExtensionFromInitializer_kt4543.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class A(val result: String)
 
 fun a(body: A.() -> String): String {

compiler/testData/codegen/box/objects/privateFunctionFromClosureInInitializer_kt5582.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 interface T
 
 object Foo {

compiler/testData/codegen/box/objects/selfReferenceToCompanionObjectInInlineLambdaInConstructorBody.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class Test {
     companion object {
         fun ok() = "OK"

compiler/testData/codegen/box/objects/selfReferenceToObjectInInlineLambdaInConstructorBody.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 object Test {
     fun ok() = "OK"
     val x = run { Test.ok() }

compiler/testData/codegen/box/properties/classFieldInsideLocalInSetter.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 class My {
     var my: String = "U"
         get() = { field }()

compiler/testData/codegen/box/properties/const/constFlags.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/call/privateProperty.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/genericSignature/kt5112.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/properties/getPropertiesMutableVsReadonly.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/properties/privateClassVar.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/properties/propertyOfNestedClassAndArrayType.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/properties/protectedClassVar.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/statics/inheritedPropertyInClassObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Bar<T>(val prop: String)
 class Foo {
     companion object : Bar<Foo>("OK") {

compiler/testData/codegen/box/statics/inheritedPropertyInObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 open class Bar<T>(val prop: String)
 object Foo : Bar<Foo>("OK") {