Remove WITH_NEW_INFERENCE directive from all tests

This directive anyway does not make test run twice with OI, and with NI It only once run the test with specific settings (// LANGUAGE) and ignores irrelevant (OI or NI tags)
2021-05-24 12:18:44 +03:00
parent d4586cefb4
commit 2ecba6ac39
1333 changed files with 2 additions and 1337 deletions
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): String {
    var s: String?
    s = null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): String {
    var s: String?
    s = null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: My.java

 public class My {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: My.java

 public class My {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +SafeCastCheckBoundSmartCasts
 interface SomeClass {
    val data: Any?
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +SafeCastCheckBoundSmartCasts
 interface SomeClass {
    val data: Any?
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x : String?, y : String?) {
    if (y != null && x == y) {
        // Both not null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x : String?, y : String?) {
    if (y != null && x == y) {
        // Both not null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x: String?, y: String?, z: String?, w: String?) {
    if (x != null && y != null && (x == z || y == z))
        z.length
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x: String?, y: String?, z: String?, w: String?) {
    if (x != null && y != null && (x == z || y == z))
        <!DEBUG_INFO_SMARTCAST!>z<!>.length
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +BooleanElvisBoundSmartCasts
 // See KT-20752

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +BooleanElvisBoundSmartCasts
 // See KT-20752

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(s: Any?): String {
    val t = when {
        // To resolve: String U Nothing? = String?
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(s: Any?): String {
    val t = when {
        // To resolve: String U Nothing? = String?
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class ExplicitAccessorForAnnotation {
    val tt: String? = "good"
        get
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class ExplicitAccessorForAnnotation {
    val tt: String? = "good"
        get
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE

 package a
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE

 package a
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-25432

 class Data<T>(val s: T)
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-25432

 class Data<T>(val s: T)
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-29767

 fun test(a: MutableList<out Int?>?) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-29767

 fun test(a: MutableList<out Int?>?) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 public interface A {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 public interface A {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE

 interface A {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE

 interface A {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // KT-10444 Do not ignore smart (unchecked) casts to the same classifier

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // KT-10444 Do not ignore smart (unchecked) casts to the same classifier

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 operator fun <K, V> MutableMap<K, V>.set(k: K, v: V) {}

 fun foo(a: MutableMap<String, String>, x: String?) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 operator fun <K, V> MutableMap<K, V>.set(k: K, v: V) {}

 fun foo(a: MutableMap<String, String>, x: String?) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Issue: KT-30826

 interface I1
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Issue: KT-30826

 interface I1
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE

 fun case_0() {
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE

 fun case_0() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Foo
 interface Bar : Foo

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Foo
 interface Bar : Foo

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun trans(n: Int, f: () -> Boolean) = if (f()) n else null

 fun foo() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun trans(n: Int, f: () -> Boolean) = if (f()) n else null

 fun foo() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
    abstract fun run()
 }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
    abstract fun run()
 }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
    abstract fun run()
 }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
    abstract fun run()
 }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Immutable(val x: String?) {
    fun foo(): String {
        if (x != null) return x
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Immutable(val x: String?) {
    fun foo(): String {
        if (x != null) return <!DEBUG_INFO_SMARTCAST!>x<!>
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import kotlin.reflect.KProperty

 class Delegate {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import kotlin.reflect.KProperty

 class Delegate {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun calc(x: List<String>?, y: Int?): Int {
    x?.get(y!! - 1) 
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun calc(x: List<String>?, y: Int?): Int {
    x?.get(y!! - 1) 
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun calc(x: List<String>?, y: Int?): Int {
    x?.subList(y!! - 1, y)
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun calc(x: List<String>?, y: Int?): Int {
    x?.subList(y!! - 1, <!DEBUG_INFO_SMARTCAST!>y<!>)
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun foo(x: String): String? = x

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun foo(x: String): String? = x

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
    val x: Any? = null
    val y = 2
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
    val x: Any? = null
    val y = 2
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-13468, KT-13765

 fun basic(): String {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-13468, KT-13765

 fun basic(): String {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo(x: Int, f: () -> Unit, y: Int) {}
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo(x: Int, f: () -> Unit, y: Int) {}
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass(var p: String?)

 fun bar(s: String): Int {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass(var p: String?)

 fun bar(s: String): Int {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
    var v: String? = null
    v<!UNSAFE_CALL!>.<!>length
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
    var v: String? = null
    v<!UNSAFE_CALL!>.<!>length
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-15792 and related

 fun foo() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-15792 and related

 fun foo() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
    fun doSomething() {}
    fun next(): SomeObject? = n    
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
    fun doSomething() {}
    fun next(): SomeObject? = n    
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
    fun doSomething() {}
    fun next(): SomeObject? = n    
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
    fun doSomething() {}
    fun next(): SomeObject? = n    
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
    fun doSomething() {}
    fun next(): SomeObject? = n    
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
    fun doSomething() {}
    fun next(): SomeObject? = n    
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 // See also KT-10735
 fun test() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 // See also KT-10735
 fun test() {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
    var v: String? = "xyz"
    // It is possible in principle to provide smart cast here
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
    var v: String? = "xyz"
    // It is possible in principle to provide smart cast here
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(arg: Int?): Int {
    var i = arg
    if (i != null && i++ == 5) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(arg: Int?): Int {
    var i = arg
    if (i != null && <!DEBUG_INFO_SMARTCAST!>i<!>++ == 5) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass

 operator fun MyClass.inc(): MyClass { return null!! }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass

 operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE{OI}!>return<!> null!! }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass

 operator fun MyClass.inc(): MyClass { return null!! }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass

 operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE{OI}!>return<!> null!! }
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun create(): Map<String, String> = null!!

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE

 fun create(): Map<String, String> = null!!

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-7186

 fun IntArray.forEachIndexed( op: (i: Int, value: Int) -> Unit) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-7186

 fun IntArray.forEachIndexed( op: (i: Int, value: Int) -> Unit) {
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
    var i: Int? = 42
    i = null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
    var i: Int? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>42<!>
    i = null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
    var s: String? = "abc"
    s = null
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
    var s: String? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>"abc"<!>
    s = null