Remove backend tests on old inference

Also remove any mentions of NewInference, and rename some tests.

compiler/testData/codegen/box/callableReference/adaptedReferences/bothWithCoercionToUnit.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(s: String = "kotlin", vararg t: String): Boolean {
     if (s != "kotlin") throw AssertionError(s)
     if (t.size != 0) throw AssertionError(t.size.toString())

compiler/testData/codegen/box/callableReference/adaptedReferences/boundReferences.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/callableReference/adaptedReferences/defaultAfterVararg.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(vararg a: String, result: String = "OK"): String =
         if (a.size == 0) result else "Fail"
 

compiler/testData/codegen/box/callableReference/adaptedReferences/defaultWithGenericExpectedType.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(x: String, y: Char = 'K'): String = x + y
 
 fun <T, U> call(f: (T) -> U, x: T): U = f(x)

compiler/testData/codegen/box/callableReference/adaptedReferences/emptyVarargAndDefault.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(x: String = "O", vararg y: String): String =
         if (y.size == 0) x + "K" else "Fail"
 

compiler/testData/codegen/box/callableReference/adaptedReferences/inlineDefault.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: STDLIB_TEXT
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 
 inline fun foo(mkString: () -> String): String =

compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVararg.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: IGNORED_IN_JS
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 inline fun foo(mkString: (Char, Char) -> String): String =
@@ -10,4 +9,4 @@ fun bar (vararg xs: Char) =
         xs.concatToString()
 
 fun box(): String = foo(::bar)
-// -> { a, b -> bar(a, b) }
+// -> { a, b -> bar(a, b) }

compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargAndDefault.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(vararg l: Long, s: String = "OK"): String =
         if (l.size == 0) s else "Fail"
 

compiler/testData/codegen/box/callableReference/adaptedReferences/inlineVarargInts.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 inline fun foo(x: (Int, Int) -> Int): Int =

compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt

@@ -1,6 +1,3 @@
-
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 class Outer(val o: String) {
     inner class Inner1(val i: Int, vararg v: String) {
         val result = "I1" + o + i + if (v.size == 0) "E" else v[0]

compiler/testData/codegen/box/callableReference/adaptedReferences/largeVararg.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference
-
 fun foo(
     f: (
         Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,

compiler/testData/codegen/box/callableReference/adaptedReferences/localFunctionWithDefault.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun call0(f: (String) -> String, x: String): String = f(x)
 fun call1(f: (String, String) -> String, x: String, y: String): String = f(x, y)
 fun call2(f: (String, String, String) -> String, x: String, y: String, z: String): String = f(x, y, z)
@@ -27,4 +25,4 @@ fun box(): String {
     val r3 = call2(::bar, "8", "9", "10")
     if (r3 != "7829") return "FAIL3 $r3"
     return "OK"
-}
+}

compiler/testData/codegen/box/callableReference/adaptedReferences/manyDefaultsAndVararg.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/callableReference/adaptedReferences/simpleDefaultArgument.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(x: String, y: String = "K"): String = x + y
 
 fun call(f: (String) -> String, x: String): String = f(x)

compiler/testData/codegen/box/callableReference/adaptedReferences/simpleEmptyVararg.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference
-
 fun foo(x: String, vararg y: String): String =
         if (y.size == 0) x + "K" else "Fail"
 

compiler/testData/codegen/box/callableReference/adaptedReferences/unboundReferences.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/callableReference/adaptedReferences/varargViewedAsPrimitiveArray.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference
-
 fun sum(vararg args: Int): Int {
     var result = 0
     for (arg in args)

compiler/testData/codegen/box/callableReference/adaptedReferences/varargWithDefaultValue.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 fun foo(x: Int, s: Int, vararg y: CharSequence = arrayOf("Aaa")): String =
         if (y.size == s && y[0].length == x) "OK" else "Fail"
 

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

@@ -1,6 +1,3 @@
-
-// !LANGUAGE: +NewInference
-
 interface JsonParser
 interface JsonCodingParser : JsonParser
 
@@ -23,4 +20,4 @@ class Test {
 fun box(): String {
     Test().fooTest()
     return result
-}
+}

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

@@ -1,5 +1,3 @@
-
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 class Foo

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

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // TARGET_BACKEND: JVM
 // WITH_REFLECT
 

compiler/testData/codegen/box/callableReference/function/coercionToUnit.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference
-
 fun foo(s: String): Boolean {
     if (s != "kotlin") throw AssertionError(s)
     return true

compiler/testData/codegen/box/callableReference/function/kt32462.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // ISSUE: KT-32462
 

compiler/testData/codegen/box/closures/anonymousObjectAsLastExpressionInLambda.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 object A {

compiler/testData/codegen/box/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
 // MODULE: lib
 // FILE: A.kt
 

compiler/testData/codegen/box/controlStructures/tryFinallyGeneric.kt

@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// !LANGUAGE: +NewInference
 
 val stack = mutableListOf<Int>()
 
@@ -22,4 +21,4 @@ fun box(): String {
     } else {
         return "OK"
     }
-}
+}

compiler/testData/codegen/box/coroutines/kt30858.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // IGNORE_BACKEND: NATIVE
 // WITH_RUNTIME
 // WITH_COROUTINES
@@ -33,4 +32,4 @@ fun box(): String {
     m.debounce(42)
 
     return "OK"
-}
+}

compiler/testData/codegen/box/coroutines/kt31784.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 @file:OptIn(ExperimentalTypeInference::class)
@@ -31,4 +30,4 @@ fun box(): String {
     }
 
     return if (r == 42) "OK" else "Fail: $r"
-}
+}

compiler/testData/codegen/box/coroutines/kt35967.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // FULL_JDK
 // ISSUE: KT-35967

compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/functionReference.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // WITH_COROUTINES

compiler/testData/codegen/box/defaultArguments/referenceAsArg.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 inline fun String.app(f: (String) -> String) = f(this)
 
 fun fff(s: String, n: Int = 42) = s

compiler/testData/codegen/box/delegatedProperty/kt35707.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // ISSUE: KT-35707
 
 import kotlin.reflect.KProperty
@@ -17,4 +16,4 @@ fun box(): String {
     } else {
         "FAIL"
     }
-}
+}

compiler/testData/codegen/box/delegatedProperty/optimizedDelegatedProperties/mixedArgumentSizes.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: -NewInference
-
 inline operator fun Double.provideDelegate(thisRef: Any?, kProp: Any?) = this.toLong()
 
 inline operator fun Long.getValue(thisRef: Any?, kProp: Any?) = this.toInt()

compiler/testData/codegen/box/delegatedProperty/provideDelegate/genericProvideDelegateOnNumberLiteral.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 import kotlin.properties.ReadOnlyProperty
@@ -26,4 +25,4 @@ fun box(): String {
     if (byStringNullable != "strNullable") return "fail5"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/elvis/genericElvisWithMoreSpecificLHS.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 fun test(foo: MutableList<String>?): List<String> {
@@ -14,4 +13,4 @@ fun box(): String {
     if (b.size != 1) return "Fail 2"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/fullJdk/kt31757.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // TARGET_BACKEND: JVM
 // SKIP_JDK6
 // FULL_JDK

compiler/testData/codegen/box/funInterface/basicFunInterfaceConversion.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
 fun interface Foo {
     fun invoke(): String
 }
@@ -8,4 +6,4 @@ fun foo(f: Foo) = f.invoke()
 
 fun box(): String {
     return foo { "OK" }
-}
+}

compiler/testData/codegen/box/funInterface/basicFunInterfaceConversionClash.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
 // FILE: lib.kt
 
 fun interface Foo {
@@ -26,4 +24,4 @@ inline fun bar2(): String {
 
 // FILE: main.kt
 
-fun box(): String = bar1() + bar2()
+fun box(): String = bar1() + bar2()

compiler/testData/codegen/box/funInterface/castFromAny.kt

@@ -1,6 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
-
 fun interface KRunnable {
     fun invoke()
 }

compiler/testData/codegen/box/funInterface/funConversionInVararg.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument
-
 fun interface MyRunnable {
     fun run()
 }

compiler/testData/codegen/box/funInterface/funInterfaceInheritance.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
 fun interface Base {
     fun doStuff(): String
 }
@@ -26,4 +24,4 @@ fun box(): String {
     if (runProxy { 10 } != "10") return "fail2"
 
     return runBase { "OK" }
-}
+}

compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_RUNTIME
 
 fun interface MyRunnable {

compiler/testData/codegen/box/funInterface/multimodule.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
 // MODULE: m1
 // FILE: m1.kt
 
@@ -42,4 +40,4 @@ fun box(): String {
     if (rn2Inline { "inline" } != "inline") return "fail 4"
 
     return rn2 { "OK" }
-}
+}

compiler/testData/codegen/box/funInterface/nullableSam.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_RUNTIME
 
 fun interface KRunnable {

compiler/testData/codegen/box/funInterface/partialSam.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_RUNTIME
 
 fun interface Fn<T, R> {
@@ -38,4 +37,4 @@ fun box(): String {
     if (x != "LFoo42239 Bar1LFoo Foo42239 LBar1Foo") return x
 
     return "OK"
-}
+}

compiler/testData/codegen/box/funInterface/primitiveConversions.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
-
 // This test should check argument coercion between the SAM and the lambda.
 // For now it checks that Char is boxed in JS
 
@@ -40,4 +38,4 @@ fun box(): String {
     if (c6 !is Char || c6 != '6') return "fail6"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/funInterface/receiverEvaluatedOnce.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_RUNTIME
 
 fun interface KRunnable {

compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // WITH_COROUTINES
 // WITH_RUNTIME
 

compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt

@@ -1,4 +1,3 @@
-
 fun Int.thisRef1() = fun () = this
 fun Int.thisRef2() = fun (): Int {return this}
 
@@ -31,4 +30,4 @@ fun box(): String {
     if ("bar".withLabel2() != "bar") return "Test 10 failed"
 
     return "OK"
-}
+}

compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReferenceNI.kt

@@ -1,36 +0,0 @@
-// !LANGUAGE: +NewInference
-// NewInference needed because of KT-26531
-
-fun Int.thisRef1() = fun () = this
-fun Int.thisRef2() = fun (): Int {return this}
-
-fun <T> T.genericThisRef1() = fun () = this
-fun <T> T.genericThisRef2() = fun (): T {return this}
-
-val Int.valThisRef1: () -> Int get() = fun () = this
-val Int.valThisRef2: () -> Int get() = fun (): Int {return this}
-
-val <T> T.valGenericThisRef1: ()->T get() = fun () = this
-val <T> T.valGenericThisRef2: ()->T get() = fun (): T {return this}
-
-val <T> T.withLabel1: ()->T get() = fun () = this@withLabel1
-val <T> T.withLabel2: ()->T get() = fun (): T {return this@withLabel2}
-
-fun box(): String {
-    if (1.thisRef1()() != 1) return "Test 1 failed"
-    if (2.thisRef2()() != 2) return "Test 2 failed"
-
-    if (3.genericThisRef1()() != 3) return "Test 3 failed"
-    if (4.genericThisRef2()() != 4) return "Test 4 failed"
-
-    if (5.valThisRef1() != 5) return "Test 5 failed"
-    if (6.valThisRef2() != 6) return "Test 6 failed"
-
-    if (7.valGenericThisRef1() != 7) return "Test 7 failed"
-    if (8.valGenericThisRef2() != 8) return "Test 8 failed"
-
-    if ("bar".withLabel1() != "bar") return "Test 9 failed"
-    if ("bar".withLabel2() != "bar") return "Test 10 failed"
-
-    return "OK"
-}

compiler/testData/codegen/box/ieee754/lessDouble_properIeeeAndNewInference.kt

@@ -1,4 +1,4 @@
-// !LANGUAGE: +ProperIeee754Comparisons +NewInference
+// !LANGUAGE: +ProperIeee754Comparisons
 
 fun box(): String {
     if (-0.0 < 0.0) return "Fail 1"

compiler/testData/codegen/box/inference/builderInference.kt

@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// !LANGUAGE: +NewInference
 // ISSUE: KT-33545
 
 import kotlin.experimental.ExperimentalTypeInference
@@ -29,4 +28,4 @@ fun <Value> Flow<Value>.asLiveData() = liveData {
 //    collect { emit(it) }
 }
 
-fun box(): String = "OK"
+fun box(): String = "OK"

compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -OPT_IN_USAGE_ERROR -UNUSED_EXPRESSION
 // WITH_RUNTIME
 

compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // Issue: KT-36371
 

compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: WASM
@@ -24,4 +23,4 @@ interface Flow<out T>
 
 interface FlowCollector<in T>
 
-fun box() = "OK"
+fun box() = "OK"

compiler/testData/codegen/box/inference/builderInferenceLeakingVariable.kt

@@ -1,6 +1,5 @@
 // Issues: KT-33542, KT-33544
 // WITH_RUNTIME
-// !LANGUAGE: +NewInference
 
 import kotlin.experimental.ExperimentalTypeInference
 

compiler/testData/codegen/box/inference/capturedStarProjection.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 interface A<T> {
@@ -11,4 +10,4 @@ fun test(a: A<*>) {
 
 fun box(): String {
     return "OK"
-}
+}

compiler/testData/codegen/box/inference/integerLiteralTypeInLamdaReturnType.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // SKIP_DCE_DRIVEN
 
@@ -15,4 +14,4 @@ fun box(): String {
     val sorted = foo.test(list)
 
     return list.first()
-}
+}

compiler/testData/codegen/box/inference/kt32429.kt

@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
-// !LANGUAGE: +NewInference
 // ISSUE: KT-32429
 
 import kotlin.properties.Delegates.observable

compiler/testData/codegen/box/inference/kt35684.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !OPT_IN: kotlin.RequiresOptIn
 // WITH_RUNTIME
 

compiler/testData/codegen/box/inference/kt36446.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // WITH_REFLECT
 

compiler/testData/codegen/box/inference/lastExpressionOfLambdaWithNothingConstraint.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 inline fun <T> foo(f: () -> T): String {
@@ -27,4 +26,4 @@ fun test(b: Boolean): String {
 
 fun box(): String {
     return test(true)
-}
+}

compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt

@@ -1,5 +1,4 @@
 // WITH_RUNTIME
-// !LANGUAGE: +NewInference
 
 class ExtensionReceiver
 typealias SuspendExtensionFunction = suspend ExtensionReceiver.() -> Unit

compiler/testData/codegen/box/javaInterop/genericSamProjectedOut.kt

@@ -1,7 +1,6 @@
-// !LANGUAGE: -NewInference
 // TARGET_BACKEND: JVM
-// WITH_RUNTIME
 // FILE: example/Hello.java
+
 package example;
 
 @FunctionalInterface
@@ -17,27 +16,28 @@ public class SomeJavaClass<A> {
         ((Hello)hello).invoke("OK");
     }
 
-    public void plus(Hello<A> hello) {
+    public SomeJavaClass<A> plus(Hello<A> hello) {
         ((Hello)hello).invoke("OK");
+        return this;
     }
 
     public void get(Hello<A> hello) {
         ((Hello)hello).invoke("OK");
     }
+
+    public void set(int i, Hello<A> hello) {
+        ((Hello)hello).invoke("OK");
+    }
 }
 
 // FILE: main.kt
 import example.SomeJavaClass
 
 fun box(): String {
-    val a: SomeJavaClass<out String> = SomeJavaClass()
+    var a: SomeJavaClass<out String> = SomeJavaClass()
 
     var result = "fail"
 
-    // a::someFunction parameter has type of Nothing
-    // while it's completely safe to pass a lambda for a SAM
-    // since Hello is effectively contravariant by its parameter
-    // NB: this ^ is not supported by FIR yet
     a.someFunction {
         result = it
     }
@@ -58,5 +58,19 @@ fun box(): String {
 
     if (result != "OK") return "fail 3: $result"
 
+    result = "fail"
+
+    a += {
+        result = it
+    }
+
+    if (result != "OK") return "fail 4: $result"
+
+    result = "fail"
+
+    a[0] = { result = it }
+
+    if (result != "OK") return "fail 5: $result"
+
     return "OK"
 }

compiler/testData/codegen/box/javaInterop/genericSamProjectedOutWithNewInference.kt

@@ -1,76 +0,0 @@
-// TARGET_BACKEND: JVM
-// FILE: example/Hello.java
-
-package example;
-
-@FunctionalInterface
-public interface Hello<A> {
-    void invoke(A a);
-}
-
-// FILE: example/SomeJavaClass.java
-package example;
-
-public class SomeJavaClass<A> {
-    public void someFunction(Hello<A> hello) {
-        ((Hello)hello).invoke("OK");
-    }
-
-    public SomeJavaClass<A> plus(Hello<A> hello) {
-        ((Hello)hello).invoke("OK");
-        return this;
-    }
-
-    public void get(Hello<A> hello) {
-        ((Hello)hello).invoke("OK");
-    }
-
-    public void set(int i, Hello<A> hello) {
-        ((Hello)hello).invoke("OK");
-    }
-}
-
-// FILE: main.kt
-import example.SomeJavaClass
-
-fun box(): String {
-    var a: SomeJavaClass<out String> = SomeJavaClass()
-
-    var result = "fail"
-
-    a.someFunction {
-        result = it
-    }
-
-    if (result != "OK") return "fail 1: $result"
-    result = "fail"
-
-    a + {
-        result = it
-    }
-
-    if (result != "OK") return "fail 2: $result"
-    result = "fail"
-
-    a[{
-        result = it
-    }]
-
-    if (result != "OK") return "fail 3: $result"
-
-    result = "fail"
-
-    a += {
-        result = it
-    }
-
-    if (result != "OK") return "fail 4: $result"
-
-    result = "fail"
-
-    a[0] = { result = it }
-
-    if (result != "OK") return "fail 5: $result"
-
-    return "OK"
-}

compiler/testData/codegen/box/javaInterop/generics/javaNestedSamInterface.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // TARGET_BACKEND: JVM
 // FILE: javaNestedSamInterface.kt
 import test.A

compiler/testData/codegen/box/mixedNamedPosition/defaults.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +MixedNamedArgumentsInTheirOwnPosition
-
 fun foo(
     p1: Int = 1,
     p2: String = "2",

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

@@ -1,4 +1,4 @@
-// !LANGUAGE: +NewInference +MixedNamedArgumentsInTheirOwnPosition
+// !LANGUAGE: +MixedNamedArgumentsInTheirOwnPosition
 
 fun foo(
     p1: Int,

compiler/testData/codegen/box/mixedNamedPosition/varargs.kt

@@ -1,4 +1,4 @@
-// !LANGUAGE: +NewInference +MixedNamedArgumentsInTheirOwnPosition
+// !LANGUAGE: +MixedNamedArgumentsInTheirOwnPosition
 
 fun foo1(
     vararg p1: Int,

compiler/testData/codegen/box/mixedNamedPosition/varargsEvaluationOrder.kt

@@ -1,4 +1,4 @@
-// !LANGUAGE: +NewInference +MixedNamedArgumentsInTheirOwnPosition
+// !LANGUAGE: +MixedNamedArgumentsInTheirOwnPosition
 // See KT-17691: Wrong argument order in resolved call with varargs. (fixed in JVM_IR)
 
 var log = ""

compiler/testData/codegen/box/package/referenceWithTheSameNameAsPackage.kt

@@ -1,6 +1,4 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
-
 // FILE: messages/foo.kt
 
 package messages
@@ -20,4 +18,4 @@ class Test {
 fun box(): String {
     val result = Test().test()
     return if (result) "faile" else "OK"
-}
+}

compiler/testData/codegen/box/platformTypes/inferenceFlexibleTToNullable.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: JS, JS_IR, NATIVE
 // IGNORE_BACKEND: JS_IR_ES6
-// !LANGUAGE: +NewInference
 
 // FILE: Foo.java
 import org.jetbrains.annotations.NotNull;

compiler/testData/codegen/box/regressions/kt33638.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 class Holder(val list: List<String>?)

compiler/testData/codegen/box/regressions/kt35914.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 
 class Inv<T>

compiler/testData/codegen/box/regressions/noAssertionsWhenNullableTypeParameterReplacedWithIntersectionType.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference
-
 class Recursive<T : Recursive<T>> : Generic<PlaceHolder<T>>, MainSupertype
 open class Simple<T> : Generic<T>, MainSupertype
 
@@ -23,4 +21,4 @@ fun <T> select(x: T?, y: T): T = y
 fun box(): String {
     takeElement(null, Simple())
     return "OK"
-}
+}

compiler/testData/codegen/box/sam/arrayAsVarargAfterSamArgument.kt

@@ -1,4 +1,4 @@
-// !LANGUAGE: +NewInference +SamConversionForKotlinFunctions +SamConversionPerArgument -ProhibitVarargAsArrayAfterSamArgument
+// !LANGUAGE: -ProhibitVarargAsArrayAfterSamArgument
 // IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 

compiler/testData/codegen/box/sam/partialSam.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +SamConversionPerArgument
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: Fn.java
@@ -41,4 +40,4 @@ fun box(): String {
     if (x != "LFoo42239 Bar1LFoo Foo42239 LBar1Foo") return x
 
     return "OK"
-}
+}

compiler/testData/codegen/box/sam/partialSamKT.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +SamConversionForKotlinFunctions +SamConversionPerArgument
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: Fn.java
@@ -38,4 +37,4 @@ fun box(): String {
     if (x != "LFoo42239 Bar1LFoo Foo42239 LBar1Foo") return x
 
     return "OK"
-}
+}

compiler/testData/codegen/box/sam/recordSubstitutedTypeForCallableSamParameter.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference +SamConversionPerArgument +SamConversionForKotlinFunctions +FunctionalInterfaceConversion
 // WITH_REFLECT
 // FULL_JDK
 // TARGET_BACKEND: JVM

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

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // IR_DUMP
 

compiler/testData/codegen/boxInline/callableReference/adaptedReferences/inlineDefault.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: STDLIB_TEXT
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/boxInline/callableReference/adaptedReferences/inlineVararg.kt

@@ -1,6 +1,5 @@
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: IGNORED_IN_JS
-// !LANGUAGE: +NewInference
 
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/callableReference/adaptedReferences/inlineVarargAndDefault.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
-
 // FILE: 1.kt
 package test
 

compiler/testData/codegen/boxInline/callableReference/adaptedReferences/inlineVarargInts.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/boxInline/callableReference/innerGenericConstuctor.kt

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // FILE: 1.kt
 package test
 

compiler/testData/codegen/bytecodeText/javaFieldsWithIntersectionTypes.kt

@@ -1,5 +1,3 @@
-// !LANGUAGE: +NewInference
-// (old inference fails in the frontend)
 // FILE: JFieldOwner.java
 
 public class JFieldOwner {