Remove LANGUAGE_VERSION from non-coroutine codegen tests

Most of these tests used this directive as a way to opt in to a new
language feature, and most of those features are already stable for a
long time, so no opt-in is needed. Some other tests used the directive
to opt out from a language feature, replace those by the `LANGUAGE`
directive. One test used the directive to test behavior that actually
depended on the API version; use `API_VERSION` directive there instead.

compiler/testData/codegen/asmLike/receiverMangling/deepNoinlineWithLabels_after.kt

@@ -1,5 +1,5 @@
+// !LANGUAGE: +NewCapturedReceiverFieldNamingConvention
 // LOCAL_VARIABLE_TABLE
-// LANGUAGE_VERSION: 1.3
 
 fun String.foo(count: Int) {
     val x = false

compiler/testData/codegen/asmLike/receiverMangling/deepNoinline_after.kt

@@ -1,5 +1,5 @@
+// !LANGUAGE: +NewCapturedReceiverFieldNamingConvention
 // LOCAL_VARIABLE_TABLE
-// LANGUAGE_VERSION: 1.3
 
 fun String.foo(count: Int) {
     val x = false

compiler/testData/codegen/box/callableReference/bound/emptyLHS.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 var result = ""
 

compiler/testData/codegen/box/collectionLiterals/collectionLiteralsInArgumentPosition.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
-// LANGUAGE_VERSION: 1.2
 // WITH_REFLECT
 
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/collectionLiterals/collectionLiteralsWithConstants.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
-// LANGUAGE_VERSION: 1.2
 // WITH_REFLECT
 
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/collectionLiterals/collectionLiteralsWithVarargs.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
-// LANGUAGE_VERSION: 1.2
 // WITH_REFLECT
 
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/collectionLiterals/defaultAnnotationParameterValues.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
-// LANGUAGE_VERSION: 1.2
 // WITH_REFLECT
 
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/compatibility/dataClassEqualsHashCodeToString.kt

@@ -1,6 +1,6 @@
+// !LANGUAGE: -DataClassInheritance
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.0
 
 data class Foo(val s: String)
 

compiler/testData/codegen/box/compatibility/privateCompanionObject.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.3
-
 class Test {
     private companion object {
         val res = "OK"

compiler/testData/codegen/box/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody12.kt

@@ -1,8 +1,8 @@
+// !LANGUAGE: -ProperForInArrayLoopRangeVariableAssignmentSemantic
 // IGNORE_BACKEND: NATIVE
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.2
 // IGNORE_BACKEND: JS
 
 fun box(): String {

compiler/testData/codegen/box/controlStructures/forInArray/forInArrayWithArrayVarUpdatedInLoopBody13.kt

@@ -1,16 +1,6 @@
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.3
 
-// In Kotlin 1.0, in a for-in-array loop, range expression is cached in
+// See https://youtrack.jetbrains.com/issue/KT-21354
-// a local variable unless it is already a local variable.
-// This caused the following quirky behavior:
-// if an array variable is updated in the loop body, it affects the loop
-// execution (see https://youtrack.jetbrains.com/issue/KT-21354).
-// Most likely it is a bug, however, fixing it right now is a breaking
-// change requiring a proper deprecation loop.
-// When the design decision is made, it might be required to update this
-// test (e.g., by adding a proper LANGUAGE_VERSION directive).
-// Note that JS back-end handles this case "correctly".
 
 fun box(): String {
     var xs = intArrayOf(1, 2, 3)

compiler/testData/codegen/box/dataClasses/copy/kt12708.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.1
+// !LANGUAGE: -ProhibitDataClassesOverridingCopy
 
 fun box(): String {
     val a: A = B(1)

compiler/testData/codegen/box/delegation/hiddenSuperOverrideIn1.0.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.0
-
 public interface Base {
     fun test() = "base fail"
 }

compiler/testData/codegen/box/delegation/simple1.0.kt

@@ -1,6 +1,6 @@
+// !LANGUAGE: -NoDelegationToJavaDefaultInterfaceMembers
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
-// LANGUAGE_VERSION: 1.0
 // FILE: Base.java
 
 public interface Base {

compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 enum class A {
     X {

compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass2.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 enum class A {
     X {

compiler/testData/codegen/box/enum/innerClassInEnumEntryClass.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 enum class A {
     X {

compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 enum class A {
     X {

compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass2.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 enum class A {
     X {
         val x = "OK"

compiler/testData/codegen/box/enum/kt7257_boundReference1.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 enum class X {
     B {

compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 
 enum class X {
     B {

compiler/testData/codegen/box/javaInterop/notNullAssertions/destructuringAssignmentWithNullabilityAssertionOnExtensionReceiver_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 var component1Evaluated = false

compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // FILE: test.kt
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 private operator fun A.inc() = A()

compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt

@@ -1,8 +1,9 @@
+// !LANGUAGE: -NullabilityAssertionOnExtensionReceiver
 // IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: test.kt
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.1
+
 import kotlin.test.*
 
 operator fun A.inc() = A()

compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // FILE: test.kt
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 operator fun A.inc() = A()

compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 fun String.extension() {}

compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 inline fun String.extension() {}

compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnMemberExtensionReceiver_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 class C {

compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnPrivateMemberExtensionReceiver_lv12.kt

@@ -2,7 +2,7 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
-// LANGUAGE_VERSION: 1.2
+
 import kotlin.test.*
 
 class C {

compiler/testData/codegen/box/jdk/stream.kt

@@ -1,9 +1,9 @@
-// SKIP_JDK6
+// JVM_TARGET: 1.8
 // IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.1
+
 import java.util.stream.*
 
 class B<F> : List<F> {

compiler/testData/codegen/box/jdk/streamBackwardCompatibility.kt

@@ -1,8 +1,9 @@
+// !LANGUAGE: -AdditionalBuiltInsMembers
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
-// LANGUAGE_VERSION: 1.0
 // WITH_RUNTIME
 // FULL_JDK
+
 class A(val x: List<String>) : List<String> by x
 
 fun box(): String {

compiler/testData/codegen/box/jvmPackageName/rootPackage.kt

@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.2
 
 // FILE: foo.kt
 

compiler/testData/codegen/box/jvmPackageName/simple.kt

@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.2
 
 // FILE: foo.kt
 

compiler/testData/codegen/box/jvmPackageName/withJvmName.kt

@@ -1,7 +1,6 @@
 // IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// LANGUAGE_VERSION: 1.2
 
 // FILE: foo.kt
 

compiler/testData/codegen/box/objects/companionObjectAccess/kt27117_lv12.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.2
+// !LANGUAGE: -ProperVisibilityForCompanionObjectInstanceField
 
 inline fun on(body: () -> Any) = body().toString()
 

compiler/testData/codegen/box/objects/companionObjectAccess/kt27117_lv13.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.3
-
 inline fun on(body: () -> Any) = body().toString()
 
 class A {

compiler/testData/codegen/box/objects/companionObjectAccess/kt27121_lv12.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.2
+// !LANGUAGE: -ProperVisibilityForCompanionObjectInstanceField
 
 interface A {
     fun test() = ok()

compiler/testData/codegen/box/objects/companionObjectAccess/kt27121_lv13.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.3
-
 interface A {
     fun test() = ok()
 

compiler/testData/codegen/box/operatorConventions/percentAsModOnBigIntegerWithoutRem.kt

@@ -1,6 +1,6 @@
+// !LANGUAGE: -ProhibitOperatorMod
+// !API_VERSION: 1.0
 // TARGET_BACKEND: JVM
-
-// LANGUAGE_VERSION: 1.0
 // FULL_JDK
 
 import java.math.BigInteger

compiler/testData/codegen/box/platformTypes/primitives/equalsNull_lv12.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt

compiler/testData/codegen/box/platformTypes/primitives/equalsNull_withExplicitFlag.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.NO_EXCEPTION_ON_EXPLICIT_EQUALS_FOR_BOXED_NULL
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME

compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/innerSubclass.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 open class Foo {

compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/sideEffects.kt

@@ -1,5 +1,4 @@
 // IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 class Foo {

compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/simpleIsInitialized.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 // FILE: J.java

compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelProperty.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 lateinit var bar: String

compiler/testData/codegen/box/properties/lateinit/local/capturedLocalLateinit.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 fun runNoInline(f: () -> Unit) = f()
 
 fun box(): String {

compiler/testData/codegen/box/properties/lateinit/local/localLateinit.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 fun box(): String {
     lateinit var ok: String
     run {

compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException

compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException

compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException

compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException

compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 // FILE: lateinit.kt
 private lateinit var s: String

compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 // FILE: lateinit.kt
 private lateinit var s: String
 

compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 lateinit var ok: String
 
 fun box(): String {

compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException

compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt

@@ -1,4 +1,3 @@
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
 
 import kotlin.UninitializedPropertyAccessException

compiler/testData/codegen/box/reified/expectedTypeFromCast.kt

@@ -1,8 +1,7 @@
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS, NATIVE
-
-// LANGUAGE_VERSION: 1.2
 // WITH_RUNTIME
+
 import kotlin.test.assertEquals
 
 inline fun <reified T> foo(): T {

compiler/testData/codegen/box/vararg/assigningArrayToVarargInAnnotation.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS_IR
-// LANGUAGE_VERSION: 1.2
 // WITH_REFLECT
 
 // IGNORE_BACKEND: JS

compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// LANGUAGE_VERSION: 1.1
 // FILE: JavaClass.java
 
 public class JavaClass {
@@ -12,10 +10,6 @@ public class JavaClass {
         return 0.0;
     }
 
-    public Double null0(){
-        return null;
-    }
-
 }
 
 
@@ -24,10 +18,9 @@ public class JavaClass {
 fun box(): String {
     val jClass = JavaClass()
 
-    if (jClass.minus0().equals(jClass.plus0())) return "fail 5"
+    if (jClass.minus0().equals(jClass.plus0())) return "fail 1"
+    if (jClass.plus0().equals(jClass.minus0())) return "fail 2"
 
-    if (jClass.null0().equals(jClass.plus0())) return "fail 6"
-    if (jClass.minus0().equals(jClass.null0())) return "fail 7"
     return "OK"
 }
 

compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCallNull.kt

@@ -0,0 +1,31 @@
+// !LANGUAGE: -ThrowNpeOnExplicitEqualsForBoxedNull
+// IGNORE_BACKEND: JVM_IR
+// FILE: JavaClass.java
+
+public class JavaClass {
+
+    public Double minus0(){
+        return -0.0;
+    }
+
+    public Double plus0(){
+        return 0.0;
+    }
+
+    public Double null0(){
+        return null;
+    }
+
+}
+
+
+// FILE: b.kt
+
+fun box(): String {
+    val jClass = JavaClass()
+
+    if (jClass.null0().equals(jClass.plus0())) return "fail 6"
+    if (jClass.minus0().equals(jClass.null0())) return "fail 7"
+    return "OK"
+}
+

compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt

@@ -1,27 +0,0 @@
-// LANGUAGE_VERSION: 1.2
-// FILE: JavaClass.java
-
-public class JavaClass {
-
-    public Double minus0(){
-        return -0.0;
-    }
-
-    public Double plus0(){
-        return 0.0;
-    }
-
-}
-
-
-// FILE: b.kt
-
-fun box(): String {
-    val jClass = JavaClass()
-
-    if (jClass.minus0().equals(jClass.plus0())) return "fail 1"
-    if (jClass.plus0().equals(jClass.minus0())) return "fail 2"
-
-    return "OK"
-}
-

compiler/testData/codegen/bytecodeListing/companionObjectVisibility_lv13.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.3
-
 open class TestProtectedCompanionInClass {
     protected companion object
 }

compiler/testData/codegen/bytecodeListing/invisibleCompanionObject.kt

@@ -1,13 +0,0 @@
-// !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField
-
-class TestPrivateCompanion {
-    private companion object Test
-}
-
-open class TestProtectedCompanion {
-    protected companion object Test
-}
-
-class TestInternalCompanion {
-    internal companion object Test
-}

compiler/testData/codegen/bytecodeListing/invisibleCompanionObject.txt

@@ -1,44 +0,0 @@
-@kotlin.Metadata
-public final class TestInternalCompanion$Test {
-    inner class TestInternalCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public final class TestInternalCompanion {
-    public final static field Test: TestInternalCompanion$Test
-    inner class TestInternalCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}
-
-@kotlin.Metadata
-final class TestPrivateCompanion$Test {
-    inner class TestPrivateCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public final class TestPrivateCompanion {
-    private final static field Test: TestPrivateCompanion$Test
-    inner class TestPrivateCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}
-
-@kotlin.Metadata
-public final class TestProtectedCompanion$Test {
-    inner class TestProtectedCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public class TestProtectedCompanion {
-    protected final static field Test: TestProtectedCompanion$Test
-    inner class TestProtectedCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}

compiler/testData/codegen/bytecodeListing/invisibleCompanionObject_lv11.kt

@@ -1,13 +0,0 @@
-// LANGUAGE_VERSION: 1.1
-
-class TestPrivateCompanion {
-    private companion object Test
-}
-
-open class TestProtectedCompanion {
-    protected companion object Test
-}
-
-class TestInternalCompanion {
-    internal companion object Test
-}

compiler/testData/codegen/bytecodeListing/invisibleCompanionObject_lv11.txt

@@ -1,44 +0,0 @@
-@kotlin.Metadata
-public final class TestInternalCompanion$Test {
-    inner class TestInternalCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public final class TestInternalCompanion {
-    public final static field Test: TestInternalCompanion$Test
-    inner class TestInternalCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}
-
-@kotlin.Metadata
-final class TestPrivateCompanion$Test {
-    inner class TestPrivateCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public final class TestPrivateCompanion {
-    public final static field Test: TestPrivateCompanion$Test
-    inner class TestPrivateCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}
-
-@kotlin.Metadata
-public final class TestProtectedCompanion$Test {
-    inner class TestProtectedCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public class TestProtectedCompanion {
-    public final static field Test: TestProtectedCompanion$Test
-    inner class TestProtectedCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}

compiler/testData/codegen/bytecodeListing/invisibleCompanionObject_lv12.kt

@@ -1,13 +0,0 @@
-// LANGUAGE_VERSION: 1.2
-
-class TestPrivateCompanion {
-    private companion object Test
-}
-
-open class TestProtectedCompanion {
-    protected companion object Test
-}
-
-class TestInternalCompanion {
-    internal companion object Test
-}

compiler/testData/codegen/bytecodeListing/invisibleCompanionObject_lv12.txt

@@ -1,44 +0,0 @@
-@kotlin.Metadata
-public final class TestInternalCompanion$Test {
-    inner class TestInternalCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public final class TestInternalCompanion {
-    public final static field Test: TestInternalCompanion$Test
-    inner class TestInternalCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}
-
-@kotlin.Metadata
-final class TestPrivateCompanion$Test {
-    inner class TestPrivateCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public final class TestPrivateCompanion {
-    public deprecated final static @java.lang.Deprecated field Test: TestPrivateCompanion$Test
-    inner class TestPrivateCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}
-
-@kotlin.Metadata
-public final class TestProtectedCompanion$Test {
-    inner class TestProtectedCompanion$Test
-    private method <init>(): void
-    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
-}
-
-@kotlin.Metadata
-public class TestProtectedCompanion {
-    public deprecated final static @java.lang.Deprecated field Test: TestProtectedCompanion$Test
-    inner class TestProtectedCompanion$Test
-    static method <clinit>(): void
-    public method <init>(): void
-}

compiler/testData/codegen/bytecodeText/constProperty/accessorsForPrivateConstants.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 // FILE: Foo.kt
 
 private const val OUTER_PRIVATE = 20

compiler/testData/codegen/bytecodeText/constProperty/noInline.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 
 const val z = 0
 

compiler/testData/codegen/bytecodeText/constProperty/noInlineInCmp.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 
 const val z = 0
 

compiler/testData/codegen/bytecodeText/constants/noInlineNonStaticJavaField_lv10.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 // FILE: test.kt
 fun test1(a: A) = a.X
 fun test2(a: A) = 1 + a.X

compiler/testData/codegen/bytecodeText/constants/noInlineNonStaticJavaField_lv11.kt

@@ -1,15 +0,0 @@
-// LANGUAGE_VERSION: 1.1
-// FILE: test.kt
-fun test1(a: A) = a.X
-fun test2(a: A) = 1 + a.X
-fun test3(a: A) = 1 < a.X
-
-// FILE: A.java
-public class A {
-    public final int X = 42;
-}
-
-// @TestKt.class:
-// 0 42
-// 0 43
-// 3 GETFIELD A.X

compiler/testData/codegen/bytecodeText/lazyCodegen/negateConstantCompare.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 
 const val one = 1
 const val two = 2
@@ -8,4 +8,5 @@ fun test1() {
         val p = 1
     }
 }
+
 // 1 IF

compiler/testData/codegen/bytecodeText/noInlineJavaProtectedConstants.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 // FILE: first/Foo.java
 
 package first;

compiler/testData/codegen/bytecodeText/nullCheckOptimization/localLateinit/checkedAlways.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 fun almostAlwaysTrue() = true
 
 fun runNoInline(f: () -> Unit) = f()

compiler/testData/codegen/bytecodeText/nullCheckOptimization/localLateinit/checkedOnce.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 fun almostAlwaysTrue() = true
 
 fun test() {

compiler/testData/codegen/bytecodeText/nullCheckOptimization/localLateinit/initialized.kt

@@ -1,5 +1,3 @@
-// LANGUAGE_VERSION: 1.2
-
 fun test() {
     lateinit var z: String
     run {

compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt

@@ -1,4 +1,4 @@
-// LANGUAGE_VERSION: 1.0
+// !LANGUAGE: -InlineConstVals
 
 const val y = "cde"
 

compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: NATIVE
 // FILE: A.kt
-// LANGUAGE_VERSION: 1.2
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @file:JvmPackageName("bar")
@@ -13,7 +12,6 @@ var v: Int = 1
 inline fun i(block: () -> Unit) = block()
 
 // FILE: B.kt
-// LANGUAGE_VERSION: 1.2
 
 import foo.*
 

compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: NATIVE
 // FILE: A.kt
-// LANGUAGE_VERSION: 1.2
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @file:JvmPackageName("bar")
@@ -10,7 +9,6 @@ fun f() = "OK"
 var v: Int = 1
 
 // FILE: B.kt
-// LANGUAGE_VERSION: 1.2
 
 fun box(): String {
     v = 2

compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: NATIVE
 // FILE: A.kt
-// LANGUAGE_VERSION: 1.2
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @file:JvmPackageName("bar")
@@ -12,7 +11,6 @@ fun f() = "OK"
 var v: Int = 1
 
 // FILE: B.kt
-// LANGUAGE_VERSION: 1.2
 
 import foo.*
 

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java

@@ -322,9 +322,9 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxAga
             runTest("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt");
         }
 
-        @TestMetadata("explicitEqualsCall_lv12.kt")
+        @TestMetadata("explicitEqualsCallNull.kt")
-        public void testExplicitEqualsCall_lv12() throws Exception {
+        public void testExplicitEqualsCallNull() throws Exception {
-            runTest("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt");
+            runTest("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCallNull.kt");
         }
 
         @TestMetadata("float.kt")

compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java

@@ -108,21 +108,6 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         runTest("compiler/testData/codegen/bytecodeListing/InlineOnlyPropertyMultifile.kt");
     }
 
-    @TestMetadata("invisibleCompanionObject.kt")
-    public void testInvisibleCompanionObject() throws Exception {
-        runTest("compiler/testData/codegen/bytecodeListing/invisibleCompanionObject.kt");
-    }
-
-    @TestMetadata("invisibleCompanionObject_lv11.kt")
-    public void testInvisibleCompanionObject_lv11() throws Exception {
-        runTest("compiler/testData/codegen/bytecodeListing/invisibleCompanionObject_lv11.kt");
-    }
-
-    @TestMetadata("invisibleCompanionObject_lv12.kt")
-    public void testInvisibleCompanionObject_lv12() throws Exception {
-        runTest("compiler/testData/codegen/bytecodeListing/invisibleCompanionObject_lv12.kt");
-    }
-
     @TestMetadata("jvmOverloadsAndParametersAnnotations.kt")
     public void testJvmOverloadsAndParametersAnnotations() throws Exception {
         runTest("compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt");

compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java

@@ -1030,11 +1030,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/constants/noInlineNonStaticJavaField_lv10.kt");
         }
 
-        @TestMetadata("noInlineNonStaticJavaField_lv11.kt")
-        public void testNoInlineNonStaticJavaField_lv11() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/constants/noInlineNonStaticJavaField_lv11.kt");
-        }
-
         @TestMetadata("nullableByteAndShort.kt")
         public void testNullableByteAndShort() throws Exception {
             runTest("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt");

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java

@@ -322,9 +322,9 @@ public class IrBlackBoxAgainstJavaCodegenTestGenerated extends AbstractIrBlackBo
             runTest("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt");
         }
 
-        @TestMetadata("explicitEqualsCall_lv12.kt")
+        @TestMetadata("explicitEqualsCallNull.kt")
-        public void testExplicitEqualsCall_lv12() throws Exception {
+        public void testExplicitEqualsCallNull() throws Exception {
-            runTest("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt");
+            runTest("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCallNull.kt");
         }
 
         @TestMetadata("float.kt")