diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/DefinitelyNotNull.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/DefinitelyNotNull.txt index 03f75d67459..01bc6bb272c 100644 --- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/DefinitelyNotNull.txt +++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/DefinitelyNotNull.txt @@ -1 +1,2 @@ -public final fun foo(x: R|T!!|, y: R|kotlin/collections/List|, z: R|(T!!) -> T!!|): R|T!!| +public final fun foo(x: R|T & Any|, y: R|kotlin/collections/List|, z: R|(T & Any) -> T & Any|): R|T & Any| + diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.fir.txt index 5ab9c4b7c37..72c998bd048 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.fir.txt @@ -7,7 +7,7 @@ FILE: use.kt } public abstract interface PersistentStateComponent : R|kotlin/Any| { } - public final fun deserializeAndLoadState(component: R|PersistentStateComponent|, clazz: R|java/lang/Class| = Q|ComponentSerializationUtil|.R|/ComponentSerializationUtil.getStateClass||>((R|/component|).R|kotlin/jvm/java|)|>)): R|kotlin/Unit| { + public final fun deserializeAndLoadState(component: R|PersistentStateComponent|, clazz: R|java/lang/Class| = Q|ComponentSerializationUtil|.R|/ComponentSerializationUtil.getStateClass||>((R|/component|).R|kotlin/jvm/java|)|>)): R|kotlin/Unit| { } public final fun use(beforeRunTask: R|BeforeRunTask<*>|): R|kotlin/Unit| { when () { diff --git a/compiler/testData/builtin-classes/java8/kotlin-collections.txt b/compiler/testData/builtin-classes/java8/kotlin-collections.txt index a85ce384106..643d145de57 100644 --- a/compiler/testData/builtin-classes/java8/kotlin-collections.txt +++ b/compiler/testData/builtin-classes/java8/kotlin-collections.txt @@ -224,14 +224,14 @@ public interface MutableMap : kotlin.collections.Map { public abstract fun clear(): kotlin.Unit public open fun compute(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? public open fun computeIfAbsent(/*0*/ p0: K, /*1*/ p1: java.util.function.Function): V - public open fun computeIfPresent(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? + public open fun computeIfPresent(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V? @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: V): V public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open fun merge(/*0*/ p0: K, /*1*/ p1: V!!, /*2*/ p2: java.util.function.BiFunction): V? + public open fun merge(/*0*/ p0: K, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public abstract fun put(/*0*/ key: K, /*1*/ value: V): V? public abstract fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open fun putIfAbsent(/*0*/ p0: K, /*1*/ p1: V): V? diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt index 318e120bc22..d7a10ccd936 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt @@ -9,7 +9,7 @@ public abstract class Mine : java.util.Map { public abstract /*fake_override*/ fun clear(): kotlin.Unit public open /*fake_override*/ fun compute(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? public open /*fake_override*/ fun computeIfAbsent(/*0*/ P2, /*1*/ java.util.function.Function): P1 - public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? + public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? public abstract /*fake_override*/ fun containsKey(/*0*/ kotlin.Any!): kotlin.Boolean public abstract /*fake_override*/ fun containsValue(/*0*/ kotlin.Any!): kotlin.Boolean public abstract /*fake_override*/ fun entrySet(): kotlin.collections.(Mutable)Set!>! @@ -18,7 +18,7 @@ public abstract class Mine : java.util.Map { public open /*fake_override*/ fun getOrDefault(/*0*/ kotlin.Any!, /*1*/ P1!): P1! public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract /*fake_override*/ fun keySet(): kotlin.collections.(Mutable)Set! - public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1!!, /*2*/ java.util.function.BiFunction): P1? + public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1 & Any, /*2*/ java.util.function.BiFunction): P1? public abstract /*fake_override*/ fun put(/*0*/ P2!, /*1*/ P1!): P1! public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.collections.MutableMap..kotlin.collections.Map?)): kotlin.Unit public open /*fake_override*/ fun putIfAbsent(/*0*/ P2, /*1*/ P1): P1? diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt index 4ce0508b667..eae654a5b2b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @org.checkerframework.checker.nullness.qual.Nullable public final var field: @org.checkerframework.checker.nullness.qual.Nullable kotlin.String? @org.checkerframework.checker.nullness.qual.NonNull public open fun bar(): @org.checkerframework.checker.nullness.qual.NonNull kotlin.String - @org.checkerframework.checker.nullness.qual.Nullable public open fun baz(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull T!!): @org.checkerframework.checker.nullness.qual.Nullable T? + @org.checkerframework.checker.nullness.qual.Nullable public open fun baz(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull T & Any): @org.checkerframework.checker.nullness.qual.Nullable T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.checkerframework.checker.nullness.qual.Nullable public open fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull kotlin.String, /*1*/ @org.checkerframework.checker.nullness.qual.Nullable y: @org.checkerframework.checker.nullness.qual.Nullable kotlin.CharSequence?): @org.checkerframework.checker.nullness.qual.Nullable kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt index 4a1679913b3..b9f6a08e7c2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @org.eclipse.jdt.annotation.Nullable public final var field: @org.eclipse.jdt.annotation.Nullable kotlin.String? @org.eclipse.jdt.annotation.NonNull public open fun bar(): @org.eclipse.jdt.annotation.NonNull kotlin.String - @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: @org.eclipse.jdt.annotation.NonNull T!!): @org.eclipse.jdt.annotation.Nullable T? + @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: @org.eclipse.jdt.annotation.NonNull T & Any): @org.eclipse.jdt.annotation.Nullable T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.eclipse.jdt.annotation.Nullable public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull x: @org.eclipse.jdt.annotation.NonNull kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable y: @org.eclipse.jdt.annotation.Nullable kotlin.CharSequence?): @org.eclipse.jdt.annotation.Nullable kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt index 417422346c1..c9bc3fd5ff9 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt @@ -16,10 +16,10 @@ public open class L!, /*1*/ S : kotlin.Any!>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open fun s(): S!! - public open fun setS(/*0*/ s: S!!): kotlin.Unit + public open fun s(): S & Any + public open fun setS(/*0*/ s: S & Any): kotlin.Unit public open fun setT(/*0*/ @spr.Nullable t: @spr.Nullable T?): kotlin.Unit - public open fun t(): T!! + public open fun t(): T & Any public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -62,10 +62,10 @@ package test { public constructor L!, /*1*/ S : kotlin.Any!>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open fun s(): S!! - public open fun setS(/*0*/ s: S!!): kotlin.Unit + public open fun s(): S & Any + public open fun setS(/*0*/ s: S & Any): kotlin.Unit public open fun setT(/*0*/ @spr.Nullable t: @spr.Nullable T?): kotlin.Unit - public open fun t(): T!! + public open fun t(): T & Any public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt index 04a50e87fa7..2b70bd907d5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt @@ -17,18 +17,18 @@ public/*package*/ open class Outer { public/*package*/ open inner class B : Outer.A { public/*package*/ constructor B() - @java.lang.Override @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open override /*1*/ fun bar(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull Y<@org.checkerframework.checker.nullness.qual.NonNull R!!>): @org.checkerframework.checker.nullness.qual.Nullable X<@org.checkerframework.checker.nullness.qual.Nullable R!>? + @java.lang.Override @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open override /*1*/ fun bar(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull Y<@org.checkerframework.checker.nullness.qual.NonNull R & Any>): @org.checkerframework.checker.nullness.qual.Nullable X<@org.checkerframework.checker.nullness.qual.Nullable R!>? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable T1?): @org.checkerframework.checker.nullness.qual.NonNull T2!! + @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable T1?): @org.checkerframework.checker.nullness.qual.NonNull T2 & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } public/*package*/ open inner class C : Outer.B { public/*package*/ constructor C() - @java.lang.Override public/*package*/ open override /*1*/ fun bar(/*0*/ x: Y): X? + @java.lang.Override public/*package*/ open override /*1*/ fun bar(/*0*/ x: Y): X? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override public/*package*/ open override /*1*/ fun foo(/*0*/ x: I?): J!! + @java.lang.Override public/*package*/ open override /*1*/ fun foo(/*0*/ x: I?): J & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -37,7 +37,7 @@ public/*package*/ open class Outer { public/*package*/ constructor D() @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun bar(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable Y<@org.checkerframework.checker.nullness.qual.Nullable F!>!): @org.checkerframework.checker.nullness.qual.NonNull X<@org.checkerframework.checker.nullness.qual.NonNull F!> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable U?): @org.checkerframework.checker.nullness.qual.NonNull W!! + @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable U?): @org.checkerframework.checker.nullness.qual.NonNull W & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt index e5f393a4162..5b8ac9abedc 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt @@ -39,19 +39,19 @@ fun main(a: ReturnType) { takeNullableStringAndNotNullK(x1) takeNotNullString(a.foo41.foo411) - val x2 = ..ReturnType.A<@org.jetbrains.annotations.Nullable kotlin.String?, @org.jetbrains.annotations.NotNull R!!>?)")!>a.foo2() + val x2 = ..ReturnType.A<@org.jetbrains.annotations.Nullable kotlin.String?, @org.jetbrains.annotations.NotNull R & Any>?)")!>a.foo2() takeNotNullStringAndKNullable(x2) takeNullableStringAndKNullable(x2) - takeNotNullStringAndNotNullK(; ReturnType.A!")!>x2) + takeNotNullStringAndNotNullK(; ReturnType.A!")!>x2) takeNullableStringAndNotNullK(x2) - val x3 = ..ReturnType.A<@org.jetbrains.annotations.NotNull kotlin.String, @org.jetbrains.annotations.NotNull R!!>?)")!>a.foo3 + val x3 = ..ReturnType.A<@org.jetbrains.annotations.NotNull kotlin.String, @org.jetbrains.annotations.NotNull R & Any>?)")!>a.foo3 takeNotNullStringAndKNullable(x3) takeNullableStringAndKNullable(x3) takeNotNullStringAndNotNullK(x3) - takeNullableStringAndNotNullK(; ReturnType.A!")!>x3) + takeNullableStringAndNotNullK(; ReturnType.A!")!>x3) - val x4 = ..kotlin.Array?)")!>a.foo4 + val x4 = ..kotlin.Array?)")!>a.foo4 takeArrayOfNotNullString(x4) takeArrayOfNullableString(x4) takeArrayOfNotNullK(x4) diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt index 964446db49a..efc14bc1dc4 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt @@ -42,22 +42,22 @@ fun main(a: ReturnTypeWithWarnings) { takeNotNullString(a.foo41.foo411) val x2 = ..ReturnTypeWithWarnings.A<(@org.jetbrains.annotations.Nullable kotlin.String..@org.jetbrains.annotations.Nullable kotlin.String?), (@org.jetbrains.annotations.NotNull R..@org.jetbrains.annotations.NotNull R?)>?)")!>a.foo2() - takeNotNullStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x2) - takeNullableStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x2) - takeNotNullStringAndNotNullK(; ReturnTypeWithWarnings.A!"), TYPE_MISMATCH("Any; R!")!>x2) + takeNotNullStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x2) + takeNullableStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x2) + takeNotNullStringAndNotNullK(; ReturnTypeWithWarnings.A!"), TYPE_MISMATCH("Any; R!")!>x2) takeNullableStringAndNotNullK(x2) val x3 = ..ReturnTypeWithWarnings.A<(@org.jetbrains.annotations.NotNull kotlin.String..@org.jetbrains.annotations.NotNull kotlin.String?), (@org.jetbrains.annotations.NotNull R..@org.jetbrains.annotations.NotNull R?)>?)")!>a.foo3 - takeNotNullStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x3) - takeNullableStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x3) + takeNotNullStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x3) + takeNullableStringAndKNullable(; ReturnTypeWithWarnings.A!")!>x3) takeNotNullStringAndNotNullK(x3) - takeNullableStringAndNotNullK(; ReturnTypeWithWarnings.A!"), TYPE_MISMATCH("Any; R!")!>x3) + takeNullableStringAndNotNullK(; ReturnTypeWithWarnings.A!"), TYPE_MISMATCH("Any; R!")!>x3) val x4 = ..kotlin.Array)")!>a.foo4 takeArrayOfNotNullString(x4) takeArrayOfNullableString(x4) takeArrayOfNotNullK(x4) - takeArrayOfNullableK(; Array<(out) R!!>")!>x4) + takeArrayOfNullableK(; Array<(out) R & Any>")!>x4) val x5 = ?..kotlin.Array?)")!>a.foo5() takeArrayOfNotNullString(x5) diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt index cfcd7adfb92..cd94612b483 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @android.annotation.Nullable public final var field: kotlin.String? @android.annotation.NonNull public open fun bar(): kotlin.String - @android.annotation.Nullable public open fun baz(/*0*/ @android.annotation.NonNull x: T!!): T? + @android.annotation.Nullable public open fun baz(/*0*/ @android.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @android.annotation.Nullable public open fun foo(/*0*/ @android.annotation.NonNull x: kotlin.String, /*1*/ @android.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt index c3cd7018a37..38582b0d0e3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @android.support.annotation.Nullable public final var field: kotlin.String? @android.support.annotation.NonNull public open fun bar(): kotlin.String - @android.support.annotation.Nullable public open fun baz(/*0*/ @android.support.annotation.NonNull x: T!!): T? + @android.support.annotation.Nullable public open fun baz(/*0*/ @android.support.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @android.support.annotation.Nullable public open fun foo(/*0*/ @android.support.annotation.NonNull x: kotlin.String, /*1*/ @android.support.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt index 2c4ffc327e4..a3f8694b26d 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @androidx.annotation.Nullable public final var field: kotlin.String? @androidx.annotation.NonNull public open fun bar(): kotlin.String - @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T!!): T? + @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @androidx.annotation.Nullable public open fun foo(/*0*/ @androidx.annotation.NonNull x: kotlin.String, /*1*/ @androidx.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt index eb09bd07899..8e341da408c 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @com.android.annotations.Nullable public final var field: kotlin.String? @com.android.annotations.NonNull public open fun bar(): kotlin.String - @com.android.annotations.Nullable public open fun baz(/*0*/ @com.android.annotations.NonNull x: T!!): T? + @com.android.annotations.Nullable public open fun baz(/*0*/ @com.android.annotations.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @com.android.annotations.Nullable public open fun foo(/*0*/ @com.android.annotations.NonNull x: kotlin.String, /*1*/ @com.android.annotations.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt index 7f9939070da..bb5b6cb8a62 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @org.eclipse.jdt.annotation.Nullable public final var field: kotlin.String? @org.eclipse.jdt.annotation.NonNull public open fun bar(): kotlin.String - @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: T!!): T? + @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.eclipse.jdt.annotation.Nullable public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull x: kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt index 3972acb3d71..262dce18ce4 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt @@ -9,7 +9,7 @@ public open class A1 { public constructor A1() @io.reactivex.annotations.Nullable public final var field: kotlin.String? @io.reactivex.annotations.NonNull public open fun bar(): kotlin.String - @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T!!): T? + @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @io.reactivex.annotations.Nullable public open fun foo(/*0*/ @io.reactivex.annotations.NonNull x: kotlin.String, /*1*/ @io.reactivex.annotations.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -31,7 +31,7 @@ public open class A3 { public constructor A3() @androidx.annotation.Nullable public final var field: kotlin.String? @androidx.annotation.NonNull public open fun bar(): kotlin.String - @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T!!): T? + @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @androidx.annotation.Nullable public open fun foo(/*0*/ @androidx.annotation.NonNull x: kotlin.String, /*1*/ @androidx.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt index 16a82d14072..38df2c16013 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @io.reactivex.annotations.Nullable public final var field: kotlin.String? @io.reactivex.annotations.NonNull public open fun bar(): kotlin.String - @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T!!): T? + @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @io.reactivex.annotations.Nullable public open fun foo(/*0*/ @io.reactivex.annotations.NonNull x: kotlin.String, /*1*/ @io.reactivex.annotations.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt index 919ca767445..02eb972d3b2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @io.reactivex.rxjava3.annotations.Nullable public final var field: @io.reactivex.rxjava3.annotations.Nullable kotlin.String? @io.reactivex.rxjava3.annotations.NonNull public open fun bar(): @io.reactivex.rxjava3.annotations.NonNull kotlin.String - @io.reactivex.rxjava3.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.rxjava3.annotations.NonNull x: @io.reactivex.rxjava3.annotations.NonNull T!!): @io.reactivex.rxjava3.annotations.Nullable T? + @io.reactivex.rxjava3.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.rxjava3.annotations.NonNull x: @io.reactivex.rxjava3.annotations.NonNull T & Any): @io.reactivex.rxjava3.annotations.Nullable T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @io.reactivex.rxjava3.annotations.Nullable public open fun foo(/*0*/ @io.reactivex.rxjava3.annotations.NonNull x: @io.reactivex.rxjava3.annotations.NonNull kotlin.String, /*1*/ @io.reactivex.rxjava3.annotations.Nullable y: @io.reactivex.rxjava3.annotations.Nullable kotlin.CharSequence?): @io.reactivex.rxjava3.annotations.Nullable kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/approximation.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/approximation.txt index 2292cfca4ef..edc9efd46c6 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/approximation.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/approximation.txt @@ -1,5 +1,5 @@ package -public fun foo(/*0*/ x: T, /*1*/ y: T!!): T!! +public fun foo(/*0*/ x: T, /*1*/ y: T & Any): T & Any public fun main(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/inference.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/inference.txt index b41a53165e8..62b9e936c45 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/inference.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/inference.txt @@ -1,7 +1,7 @@ package -public fun expectNN(/*0*/ e: E!!): kotlin.Unit +public fun expectNN(/*0*/ e: E & Any): kotlin.Unit public fun main(/*0*/ x: F, /*1*/ y: F, /*2*/ z: F, /*3*/ w: F, /*4*/ m: F): kotlin.Unit public fun removeQuestionMark(/*0*/ x: K?): K -public fun toDefNotNull(/*0*/ s: T): T!! +public fun toDefNotNull(/*0*/ s: T): T & Any public fun kotlin.Any.foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/notApplicable.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/notApplicable.txt index 84f2eb14186..1bae99eab5f 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/notApplicable.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/notApplicable.txt @@ -8,8 +8,8 @@ public fun bar3(/*0*/ x: F?): kotlin.Unit public fun bar4(/*0*/ x: F?): kotlin.Unit public fun bar5(/*0*/ x: F): kotlin.Unit public fun bar6(/*0*/ x: F): kotlin.Unit -public fun bar7(/*0*/ x: F!!): kotlin.Unit -public fun bar8(/*0*/ x: F!!.() -> kotlin.Unit): kotlin.Unit +public fun bar7(/*0*/ x: F & Any): kotlin.Unit +public fun bar8(/*0*/ x: F & Any.() -> kotlin.Unit): kotlin.Unit public fun foo(/*0*/ x: T, /*1*/ y: kotlin.collections.List): kotlin.Unit -public fun F!!.bar9(/*0*/ x: () -> kotlin.Unit): kotlin.Unit +public fun F & Any.bar9(/*0*/ x: () -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overrides.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overrides.txt index 50b2bc774ec..005355ac73d 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overrides.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overrides.txt @@ -1,7 +1,7 @@ package public interface A { - public abstract fun bar(/*0*/ x: T!!): T!! + public abstract fun bar(/*0*/ x: T & Any): T & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun foo(/*0*/ x: T): T public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -9,7 +9,7 @@ public interface A { } public interface B : A { - public abstract override /*1*/ fun bar(/*0*/ x: T1!!): T1!! + public abstract override /*1*/ fun bar(/*0*/ x: T1 & Any): T1 & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ fun foo(/*0*/ x: T1): T1 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -18,10 +18,10 @@ public interface B : A { public interface C : A { public abstract fun bar(/*0*/ x: T2): T2 - public abstract override /*1*/ /*fake_override*/ fun bar(/*0*/ x: T2!!): T2!! + public abstract override /*1*/ /*fake_override*/ fun bar(/*0*/ x: T2 & Any): T2 & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: T2): T2 - public abstract fun foo(/*0*/ x: T2!!): T2!! + public abstract fun foo(/*0*/ x: T2 & Any): T2 & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overridesJavaAnnotated.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overridesJavaAnnotated.txt index 6c3f08fa065..04036d89c06 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overridesJavaAnnotated.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/overridesJavaAnnotated.txt @@ -1,7 +1,7 @@ package public interface A { - @org.jetbrains.annotations.NotNull public abstract fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T!!): T!! + @org.jetbrains.annotations.NotNull public abstract fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): T & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun foo(/*0*/ x: T!): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -9,7 +9,7 @@ public interface A { } public interface B : A { - public abstract override /*1*/ fun bar(/*0*/ x: T1!!): T1!! + public abstract override /*1*/ fun bar(/*0*/ x: T1 & Any): T1 & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ fun foo(/*0*/ x: T1): T1 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -18,10 +18,10 @@ public interface B : A { public interface C : A { public abstract fun bar(/*0*/ x: T2): T2 - @org.jetbrains.annotations.NotNull public abstract override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T2!!): T2!! + @org.jetbrains.annotations.NotNull public abstract override /*1*/ /*fake_override*/ fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T2 & Any): T2 & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public abstract fun foo(/*0*/ x: T2 & Any): T2 & Any public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: T2!): T2! - public abstract fun foo(/*0*/ x: T2!!): T2!! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/simple.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/simple.txt index db1673f7a72..312fef63db4 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/simple.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/simple.txt @@ -1,4 +1,4 @@ package -public fun foo(/*0*/ x: T, /*1*/ y: T!!): T!! +public fun foo(/*0*/ x: T, /*1*/ y: T & Any): T & Any public fun main(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt index d6537911f37..4f52d24c1e1 100644 --- a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt +++ b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt @@ -6,6 +6,6 @@ public fun process(/*0*/ x: Predicate): kotlin.Unit public interface Predicate { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract operator fun invoke(/*0*/ @org.jetbrains.annotations.NotNull t: T!!): kotlin.Boolean + public abstract operator fun invoke(/*0*/ @org.jetbrains.annotations.NotNull t: T & Any): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/inference/completion/definitelyNotNullType.kt b/compiler/testData/diagnostics/tests/inference/completion/definitelyNotNullType.kt index 57f61fb04bc..dfc3d225f0e 100644 --- a/compiler/testData/diagnostics/tests/inference/completion/definitelyNotNullType.kt +++ b/compiler/testData/diagnostics/tests/inference/completion/definitelyNotNullType.kt @@ -3,23 +3,23 @@ fun test(derived: T) { ")!>id>( - ")!>makeOut( - makeDnn(derived) + ")!>makeOut( + makeDnn(derived) ) ) ")!>id>( ")!>makeIn( - makeDnn(derived) + makeDnn(derived) ) ) ")!>id>( ")!>makeInv( - makeDnn(derived) + makeDnn(derived) ) ) >")!>id>>( - >")!>makeInIn( - makeDnn(derived) + >")!>makeInIn( + makeDnn(derived) ) ) } diff --git a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInArguments.kt b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInArguments.kt index bde686d5303..43379b5a36f 100644 --- a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInArguments.kt +++ b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInArguments.kt @@ -35,66 +35,66 @@ fun foo23(x: K?, y: Foo>>) {} fun foo24(x: K?, y: Foo>>) {} fun main(x: L?, y: L) { - foo0(x, ")!>Bar()) - foo0(y, ")!>Bar()) + foo0(x, ")!>Bar()) + foo0(y, ")!>Bar()) - foo1(x, >")!>Foo(Bar())) - foo1(y, >")!>Foo(Bar())) + foo1(x, >")!>Foo(Bar())) + foo1(y, >")!>Foo(Bar())) if (x != null && y != null) { - foo1(x, >")!>Foo(Bar())) - foo1(y, >")!>Foo(Bar())) + foo1(x, >")!>Foo(Bar())) + foo1(y, >")!>Foo(Bar())) } - foo2(x, >")!>Foo(Bar())) - foo2(y, >")!>Foo(Bar())) + foo2(x, >")!>Foo(Bar())) + foo2(y, >")!>Foo(Bar())) - foo3(x, >")!>Foo(Bar())) - foo3(y, >")!>Foo(Bar())) + foo3(x, >")!>Foo(Bar())) + foo3(y, >")!>Foo(Bar())) - foo4(x, >")!>Foo(Bar())) - foo4(y, >")!>Foo(Bar())) + foo4(x, >")!>Foo(Bar())) + foo4(y, >")!>Foo(Bar())) - foo5(x, ")!>Bar()) - foo5(y, ")!>Bar()) + foo5(x, ")!>Bar()) + foo5(y, ")!>Bar()) - foo6(x, ")!>OutBar()) - foo6(y, ")!>OutBar()) + foo6(x, ")!>OutBar()) + foo6(y, ")!>OutBar()) - foo7(x, ")!>InBar()) - foo7(y, ")!>InBar()) + foo7(x, ")!>InBar()) + foo7(y, ")!>InBar()) - foo8(x, >")!>Foo(Bar())) - foo8(y, >")!>Foo(Bar())) + foo8(x, >")!>Foo(Bar())) + foo8(y, >")!>Foo(Bar())) - foo9(x, >")!>Foo(Bar())) - foo9(y, >")!>Foo(Bar())) + foo9(x, >")!>Foo(Bar())) + foo9(y, >")!>Foo(Bar())) - foo10(x, >")!>Foo(Bar()), ")!>Bar()) - foo10(y, >")!>Foo(Bar()), ")!>Bar()) + foo10(x, >")!>Foo(Bar()), ")!>Bar()) + foo10(y, >")!>Foo(Bar()), ")!>Bar()) - foo11(x, >")!>Foo(Bar()), ")!>Bar()) - foo11(y, >")!>Foo(Bar()), ")!>Bar()) + foo11(x, >")!>Foo(Bar()), ")!>Bar()) + foo11(y, >")!>Foo(Bar()), ")!>Bar()) if (x != null && y != null) { - foo12(x, ")!>Bar()) - foo12(y, ")!>Bar()) + foo12(x, ")!>Bar()) + foo12(y, ")!>Bar()) } - foo12(x, ")!>Bar()) - foo12(y, ")!>Bar()) + foo12(x, ")!>Bar()) + foo12(y, ")!>Bar()) Foo13(x).foo1(x, ")!>Bar()) Foo13(x).foo2(y, ")!>Bar()) Foo13(y).foo1(x, ")!>Bar()) Foo13(y).foo2(y, ")!>Bar()) if (x != null) { - Foo13(x).foo2(y, ")!>Bar()) + Foo13(x).foo2(y, ")!>Bar()) Foo13(y).foo2(x, ")!>Bar()) } if (y != null) { Foo13(x).foo2(y, ")!>Bar()) - Foo13(y).foo2(x, ")!>Bar()) + Foo13(y).foo2(x, ")!>Bar()) } foo14("y", ")!>Bar()) @@ -110,22 +110,22 @@ fun main(x: L?, y: L) { foo16(x, ")!>Bar()) foo16(y, ")!>Bar()) if (x != null && y != null) { - foo16(x, ")!>Bar()) - foo16(y, ")!>Bar()) + foo16(x, ")!>Bar()) + foo16(y, ")!>Bar()) } Bar().foo18(x) Bar().foo18(y) - foo21(x, >>")!>Foo(Foo(OutBar()))) - foo21(y, >>")!>Foo(Foo(OutBar()))) + foo21(x, >>")!>Foo(Foo(OutBar()))) + foo21(y, >>")!>Foo(Foo(OutBar()))) - foo22(x, >>")!>Foo(Foo(InBar()))) - foo22(y, >>")!>Foo(Foo(InBar()))) + foo22(x, >>")!>Foo(Foo(InBar()))) + foo22(y, >>")!>Foo(Foo(InBar()))) - foo23(x, >>")!>Foo(Foo(Bar()))) - foo23(y, >>")!>Foo(Foo(Bar()))) + foo23(x, >>")!>Foo(Foo(Bar()))) + foo23(y, >>")!>Foo(Foo(Bar()))) - foo24(x, >>")!>Foo(Foo(Bar()))) - foo24(y, >>")!>Foo(Foo(Bar()))) + foo24(x, >>")!>Foo(Foo(Bar()))) + foo24(y, >>")!>Foo(Foo(Bar()))) } diff --git a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt index c6aedf47367..ebeb5ba9d8b 100644 --- a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt +++ b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt @@ -75,12 +75,12 @@ val K?.vfoo2: OutBar>> get() = materialize() class Main(x: L?, y: L) { init { if (x != null && y != null) { - val x12 = >")!>foo1(x) - val x13 = >")!>foo1(y) + val x12 = >")!>foo1(x) + val x13 = >")!>foo1(y) } if (x != null && y != null) { - val x120 = ")!>foo12(x) - val x121 = ")!>foo12(y) + val x120 = ")!>foo12(x) + val x121 = ")!>foo12(y) } if (x != null) { val x137 = ")!>Foo13(y).foo1(x) @@ -93,8 +93,8 @@ class Main(x: L?, y: L) { val x154 = ")!>foo15(y) } if (x != null && y != null) { - val x163 = ")!>foo16(x) - val x164 = ")!>foo16(y) + val x163 = ")!>foo16(x) + val x164 = ")!>foo16(y) } } @@ -104,8 +104,8 @@ class Main(x: L?, y: L) { val x10 = >")!>foo1(x) val x11 = >")!>foo1(y) - val x12 = >")!>foo1(x!!) - val x13 = >")!>foo1(y!!) + val x12 = >")!>foo1(x!!) + val x13 = >")!>foo1(y!!) val x20 = >")!>foo2(x) val x21 = >")!>foo2(y) @@ -119,8 +119,8 @@ class Main(x: L?, y: L) { val x50 = ")!>foo5(x) val x51 = ")!>foo5(y) - val x60 = ")!>foo6(x) - val x61 = ")!>foo6(y) + val x60 = ")!>foo6(x) + val x61 = ")!>foo6(y) val x70 = ")!>foo7(x) val x71 = ")!>foo7(y) @@ -137,8 +137,8 @@ class Main(x: L?, y: L) { val x110 = ")!>foo11(x, >")!>Foo(Bar())) val x111 = ")!>foo11(y, >")!>Foo(Bar())) - val x120 = ")!>foo12(x!!) - val x121 = ")!>foo12(y!!) + val x120 = ")!>foo12(x!!) + val x121 = ")!>foo12(y!!) val x122 = ")!>foo12(x) val x123 = ")!>foo12(y) @@ -158,8 +158,8 @@ class Main(x: L?, y: L) { val x161 = ")!>foo16(x) val x162 = ")!>foo16(y) - val x163 = ")!>foo16(x!!) - val x164 = ")!>foo16(y!!) + val x163 = ")!>foo16(x!!) + val x164 = ")!>foo16(y!!) val x170 = ")!>foo17(x) val x171 = ")!>foo17(y) @@ -182,29 +182,29 @@ class Main(x: L?, y: L) { val x240 = >>")!>foo24(x) val x241 = >>")!>foo24(y) - val x250 = ")!>foo25(x) - val x251 = ")!>foo25(y) + val x250 = ")!>foo25(x) + val x251 = ")!>foo25(y) - val x260 = >>")!>foo26(x) - val x261 = >>")!>foo26(y) + val x260 = >>")!>foo26(x) + val x261 = >>")!>foo26(y) val x270 = >>")!>foo27(x) val x271 = >>")!>foo27(y) - val x280 = >>")!>foo28(x) - val x281 = >>")!>foo28(y) + val x280 = >>")!>foo28(x) + val x281 = >>")!>foo28(y) val x290 = >>")!>foo29(x) val x291 = >>")!>foo29(y) - val x300 = >>")!>foo30(x) - val x301 = >>")!>foo30(y) + val x300 = >>")!>foo30(x) + val x301 = >>")!>foo30(y) - val x310 = /* = Bar */")!>foo31(x) - val x311 = /* = Bar */")!>foo31(y) + val x310 = /* = Bar */")!>foo31(x) + val x311 = /* = Bar */")!>foo31(y) - val x320 = /* = OutBar */")!>foo32(x) - val x321 = /* = OutBar */")!>foo32(y) + val x320 = /* = OutBar */")!>foo32(x) + val x321 = /* = OutBar */")!>foo32(y) val x330 = >>")!>foo33(x) val x331 = >>")!>foo33(y) @@ -221,8 +221,8 @@ class Main(x: L?, y: L) { val vx01 = >")!>x.vfoo0 val vx02 = >")!>y.vfoo0 - val vx11 = >>")!>x.vfoo1 - val vx12 = >>")!>y.vfoo1 + val vx11 = >>")!>x.vfoo1 + val vx12 = >>")!>y.vfoo1 val vx21 = >>")!>x.vfoo2 val vx22 = >>")!>y.vfoo2 @@ -258,8 +258,8 @@ class Main(x: L?, y: L) { val x460 = >>")!>foo46(x) val x461 = >>")!>foo46(y) - val x470 = >>")!>foo47(x) - val x471 = >>")!>foo47(y) + val x470 = >>")!>foo47(x) + val x471 = >>")!>foo47(y) fun takeLambda(block: () -> R): R = materialize() val x480 = ")!>takeLambda { foo48 { x } } diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.ni.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.ni.kt index 21aa9aeabef..fe7d43113f8 100644 --- a/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.ni.kt +++ b/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.ni.kt @@ -166,18 +166,18 @@ fun case_11(y: T) { x1 x2 - x3 - y + x3 + y ")!>result_1 ")!>result_2 - ")!>result_3 + ")!>result_3 ")!>result_4 ")!>result_5 - ")!>result_6 + ")!>result_6 ")!>result_7 ")!>result_8 - ")!>result_9 + ")!>result_9 result_10 result_11 diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt index 14e65298245..34d124cafa0 100644 --- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt +++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt @@ -11,9 +11,9 @@ public open class A { public open class X { public constructor X() - public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T!!): kotlin.Unit + public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T!! + @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt index 374536e04a4..19274f361eb 100644 --- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt +++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt @@ -11,9 +11,9 @@ public open class A { public open class X { public constructor X() - public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T!!): kotlin.Unit + public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T!! + @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullable.txt b/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullable.txt index 79857304f0f..474df317bb3 100644 --- a/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullable.txt +++ b/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullable.txt @@ -7,9 +7,9 @@ public interface SLRUMap { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun id(/*0*/ value: K!): K! - public abstract fun takeE(/*0*/ @org.jetbrains.annotations.NotNull value: E!!): kotlin.Unit - public abstract fun takeEList(/*0*/ @org.jetbrains.annotations.NotNull value: kotlin.collections.(Mutable)List<@org.jetbrains.annotations.NotNull E!!>): kotlin.Unit - public abstract fun takeV(/*0*/ @org.jetbrains.annotations.NotNull value: V!!): kotlin.Unit - public abstract fun takeVList(/*0*/ @org.jetbrains.annotations.NotNull value: kotlin.collections.(Mutable)List<@org.jetbrains.annotations.NotNull V!!>): kotlin.Unit + public abstract fun takeE(/*0*/ @org.jetbrains.annotations.NotNull value: E & Any): kotlin.Unit + public abstract fun takeEList(/*0*/ @org.jetbrains.annotations.NotNull value: kotlin.collections.(Mutable)List<@org.jetbrains.annotations.NotNull E & Any>): kotlin.Unit + public abstract fun takeV(/*0*/ @org.jetbrains.annotations.NotNull value: V & Any): kotlin.Unit + public abstract fun takeVList(/*0*/ @org.jetbrains.annotations.NotNull value: kotlin.collections.(Mutable)List<@org.jetbrains.annotations.NotNull V & Any>): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt index ea0b231ba9f..64dfc540d79 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt @@ -9,5 +9,5 @@ public open class JClass { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - @org.jetbrains.annotations.NotNull public open fun getNotNullT(): T!! + @org.jetbrains.annotations.NotNull public open fun getNotNullT(): T & Any } diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt index 4731e692ce3..92e0b4acb3a 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T!!): kotlin.Unit + public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -20,7 +20,7 @@ public open class B { public open class C : B, A { public constructor C() public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*2*/ fun foo(/*0*/ x: F!!): kotlin.Unit + public open override /*2*/ fun foo(/*0*/ x: F & Any): kotlin.Unit public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt index e055f933db9..b621bde0c50 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt @@ -9,6 +9,6 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T!!, /*1*/ y: T!): kotlin.Unit + public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any, /*1*/ y: T!): kotlin.Unit public open fun platformString(): kotlin.String! } diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt index 0e28a7bc296..fb265967174 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public open class A { public constructor A() - @org.jetbrains.annotations.NotNull public open fun bar(): T!! + @org.jetbrains.annotations.NotNull public open fun bar(): T & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt index 9de056de37c..4440bdd8174 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public open class A { public constructor A() - public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T!!): kotlin.Unit + public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt index 10f7ac28dec..786b3f996da 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt @@ -4,7 +4,7 @@ public fun test(/*0*/ a: A): kotlin.Unit public open class A { public constructor A() - @org.jetbrains.annotations.NotNull public open fun bar(): T!! + @org.jetbrains.annotations.NotNull public open fun bar(): T & Any public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt index db1308ce07a..b72088ea9c5 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public open class A { public constructor A() - public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T!!): kotlin.Unit + public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt index dc3ad9df2c6..f525584ff9e 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt @@ -15,5 +15,5 @@ public open class J { @org.jetbrains.annotations.NotNull public final var staticNN: J public open fun getAny(): T! @org.jetbrains.annotations.Nullable public open fun getNAny(): T? - @org.jetbrains.annotations.NotNull public open fun getNNAny(): T!! + @org.jetbrains.annotations.NotNull public open fun getNNAny(): T & Any } diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt index 4f953825b58..bc3bf2cae15 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt @@ -6,7 +6,7 @@ public fun main(): kotlin.Unit public/*package*/ open class A { public/*package*/ constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jetbrains.annotations.NotNull public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T!!, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.collections.(Mutable)List?): kotlin.collections.(Mutable)List + @org.jetbrains.annotations.NotNull public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.collections.(Mutable)List?): kotlin.collections.(Mutable)List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt index f3c450ec57d..378dd5e374c 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt @@ -2,7 +2,7 @@ package public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T!!, /*1*/ @org.jetbrains.annotations.Nullable y: T?): kotlin.Unit + public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any, /*1*/ @org.jetbrains.annotations.Nullable y: T?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt index ed9a9f7bbce..8130bb5bc63 100644 --- a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt @@ -14,7 +14,7 @@ public final class KotlinMap1 : java.util.AbstractMap { protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any! public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K!, /*1*/ p1: java.util.function.Function): V! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -23,7 +23,7 @@ public final class KotlinMap1 : java.util.AbstractMap { @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V!!, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V? diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt index 07f8031809d..92969b453bc 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt @@ -1,6 +1,6 @@ package -public val test1: [ERROR : Type for BOutIn(listOf(), null!!)] +public val test1: [ERROR : Type for BOutIn(listOf(), null & Any)] public val test2: BInIn /* = Bound, in kotlin.Nothing> */ public fun listOf(): kotlin.collections.List diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt index 35d38a0bbef..894113b6187 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt @@ -22,7 +22,7 @@ public open class SmartFMap : kotl public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open fun plus(/*0*/ @org.jetbrains.annotations.NotNull key: K!!, /*1*/ value: V!): SmartFMap! + public open fun plus(/*0*/ @org.jetbrains.annotations.NotNull key: K & Any, /*1*/ value: V!): SmartFMap! public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ key: K!): V? diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt index c0275ecaabb..978ed1e9819 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt @@ -4,7 +4,7 @@ public abstract interface TypeParamOfClass : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T!!| + @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T & Any| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt index f4f0475e6ae..463dc75a5ad 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt @@ -4,11 +4,11 @@ public interface TypeParamOfClass { public interface Sub : test.TypeParamOfClass.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(): T!! + public abstract override /*1*/ fun foo(): T & Any } public interface Super { public abstract fun dummy(): kotlin.Unit - @org.jetbrains.annotations.NotNull public abstract fun foo(): T!! + @org.jetbrains.annotations.NotNull public abstract fun foo(): T & Any } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt index a875be1fa4a..b4aef940e43 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt @@ -4,7 +4,7 @@ public abstract interface TypeParamOfClassSubstituted : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T!!| + @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T & Any| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt index de82f408f73..d348dd1a04f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt @@ -9,6 +9,6 @@ public interface TypeParamOfClassSubstituted { public interface Super { public abstract fun dummy(): kotlin.Unit - @org.jetbrains.annotations.NotNull public abstract fun foo(): T!! + @org.jetbrains.annotations.NotNull public abstract fun foo(): T & Any } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt index dcb31b63b56..e59a760bcd7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt @@ -1,10 +1,10 @@ public abstract interface TypeParamOfFun : R|kotlin/Any| { public abstract interface Sub : R|test/TypeParamOfFun.Super| { - public abstract fun |> foo(): R|@EnhancedNullability E!!| + public abstract fun |> foo(): R|@EnhancedNullability E & Any| } public abstract interface Super : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public abstract fun |> foo(): R|@EnhancedNullability T!!| + @R|org/jetbrains/annotations/NotNull|() public abstract fun |> foo(): R|@EnhancedNullability T & Any| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt index 4a57834c371..963f425cc5c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt @@ -4,11 +4,11 @@ public interface TypeParamOfFun { public interface Sub : test.TypeParamOfFun.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(): E!! + public abstract override /*1*/ fun foo(): E & Any } public interface Super { public abstract fun dummy(): kotlin.Unit - @org.jetbrains.annotations.NotNull public abstract fun foo(): T!! + @org.jetbrains.annotations.NotNull public abstract fun foo(): T & Any } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.txt index 60d09ed7fec..b6f4364ae55 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.txt @@ -1,3 +1,3 @@ package test -public fun foo(/*0*/ x: T!!, /*1*/ y: kotlin.collections.List, /*2*/ z: (T!!) -> T!!): T!! +public fun foo(/*0*/ x: T & Any, /*1*/ y: kotlin.collections.List, /*2*/ z: (T & Any) -> T & Any): T & Any diff --git a/compiler/testData/loadJava8/compiledJava/MapRemove.txt b/compiler/testData/loadJava8/compiledJava/MapRemove.txt index 87e40ee5007..0d647dde632 100644 --- a/compiler/testData/loadJava8/compiledJava/MapRemove.txt +++ b/compiler/testData/loadJava8/compiledJava/MapRemove.txt @@ -12,14 +12,14 @@ public open class MapRemove { public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K!, /*1*/ p1: java.util.function.Function): V! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V? @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V! public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V!!, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V? diff --git a/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt b/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt index b9a06e801de..835dab7c51d 100644 --- a/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt +++ b/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt @@ -2,7 +2,7 @@ package test public open class Basic { public constructor Basic() - public/*package*/ open fun foo(/*0*/ p0: R!): kotlin.Unit + public/*package*/ open fun foo(/*0*/ p0: R!): kotlin.Unit public interface G { public abstract fun foo(/*0*/ p0: R): kotlin.Unit diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt index efafa3f92f9..a479ecfc05b 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -12,10 +12,10 @@ public/*package*/ open class A3() } -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B!!, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B!!> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -27,10 +27,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B!!, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt index fac8554fc13..29b186352a8 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt @@ -3,7 +3,7 @@ package test public open class Basic { public constructor Basic() - public/*package*/ interface G : test.Basic.G2<@org.jetbrains.annotations.NotNull T!!, @org.jetbrains.annotations.NotNull kotlin.String> { + public/*package*/ interface G : test.Basic.G2<@org.jetbrains.annotations.NotNull T & Any, @org.jetbrains.annotations.NotNull kotlin.String> { } public/*package*/ interface G2 { diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt index f29ebe5077a..874fe5f394e 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt @@ -21,7 +21,7 @@ public open class Basic_DisabledImprovements!): kotlin.Unit public abstract fun !>!> f10(/*0*/ p0: T!): kotlin.Unit public abstract fun f2(): test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.Nullable kotlin.String!, @org.jetbrains.annotations.NotNull kotlin.Int!>! - public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull p0: @org.jetbrains.annotations.NotNull T!!): kotlin.Unit + public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull p0: @org.jetbrains.annotations.NotNull T & Any): kotlin.Unit public abstract fun f4(/*0*/ p0: test.Basic_DisabledImprovements.G<(@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String!>..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit public abstract fun f5(/*0*/ p0: test.Basic_DisabledImprovements.G<*>!): kotlin.Unit public abstract fun f6(/*0*/ p0: test.Basic_DisabledImprovements.G!): kotlin.Unit diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt index f0dd0900edd..24c0214dfc8 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -22,15 +22,15 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G3 where B : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I1 { } - public/*package*/ open inner class G4 { - public/*package*/ constructor G4() + public/*package*/ open inner class G4 { + public/*package*/ constructor G4() } public/*package*/ interface G5 { } - public/*package*/ open inner class G6 { - public/*package*/ constructor G6() + public/*package*/ open inner class G6 { + public/*package*/ constructor G6() } public/*package*/ interface G7 where _A : test.ClassTypeParameterBounds.I2<@org.jetbrains.annotations.NotNull kotlin.Int>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt index 3bab8d4816e..25276820749 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,17 +5,17 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ p0: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ p0: _A!!): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ p0: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ p0: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? - public/*package*/ open fun f4(/*0*/ p0: _A, /*1*/ p1: B!): kotlin.Unit + public/*package*/ open fun f4(/*0*/ p0: _A, /*1*/ p1: B!): kotlin.Unit public/*package*/ open fun f5(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit public/*package*/ open fun f6(): kotlin.Unit - public/*package*/ abstract fun f7(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit - public/*package*/ abstract fun f8(/*0*/ p0: _A, /*1*/ p1: B!, /*2*/ p2: C!, /*3*/ p3: D, /*4*/ p4: E!, /*5*/ p5: F!): kotlin.Unit + public/*package*/ abstract fun f7(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit + public/*package*/ abstract fun f8(/*0*/ p0: _A, /*1*/ p1: B!, /*2*/ p2: C!, /*3*/ p3: D, /*4*/ p4: E!, /*5*/ p5: F!): kotlin.Unit public/*package*/ open fun f9(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2<@org.jetbrains.annotations.Nullable kotlin.Int?>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ interface I1 { diff --git a/compiler/testData/loadJava8/sourceJava/MapRemove.txt b/compiler/testData/loadJava8/sourceJava/MapRemove.txt index 89732378475..f30fb25a4f2 100644 --- a/compiler/testData/loadJava8/sourceJava/MapRemove.txt +++ b/compiler/testData/loadJava8/sourceJava/MapRemove.txt @@ -12,14 +12,14 @@ public open class MapRemove { public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K!, /*1*/ p1: java.util.function.Function): V! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V? @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V! public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V!!, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V? diff --git a/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt b/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt index 61c10f5eb8f..6be6cc3fcd7 100644 --- a/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt +++ b/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt @@ -2,7 +2,7 @@ package test public open class Basic { public constructor Basic() - public/*package*/ open fun foo(/*0*/ r: R!): kotlin.Unit + public/*package*/ open fun foo(/*0*/ r: R!): kotlin.Unit public interface G { public abstract fun foo(/*0*/ r: R): kotlin.Unit diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt index 552bc2b7238..428a527ee47 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -1,9 +1,9 @@ package test -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B!!, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B!!> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -15,10 +15,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B!!, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt index ed380fabad3..3e060121e6b 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt @@ -11,7 +11,7 @@ public open class Basic_DisabledImprovements : test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.NotNull T!!, @org.jetbrains.annotations.NotNull kotlin.String> { + public/*package*/ interface G : test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.NotNull T & Any, @org.jetbrains.annotations.NotNull kotlin.String> { } public/*package*/ interface G2 { @@ -21,7 +21,7 @@ public open class Basic_DisabledImprovements!): kotlin.Unit public abstract fun !>!> f10(/*0*/ p: T!): kotlin.Unit public abstract fun f2(): test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.Nullable kotlin.String?, @org.jetbrains.annotations.NotNull kotlin.Int>! - public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull x: @org.jetbrains.annotations.NotNull T!!): kotlin.Unit + public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull x: @org.jetbrains.annotations.NotNull T & Any): kotlin.Unit public abstract fun f4(/*0*/ p: test.Basic_DisabledImprovements.G<(@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String!>..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit public abstract fun f5(/*0*/ p: test.Basic_DisabledImprovements.G<*>!): kotlin.Unit public abstract fun f6(/*0*/ p: test.Basic_DisabledImprovements.G!): kotlin.Unit diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt index f0dd0900edd..24c0214dfc8 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -22,15 +22,15 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G3 where B : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I1 { } - public/*package*/ open inner class G4 { - public/*package*/ constructor G4() + public/*package*/ open inner class G4 { + public/*package*/ constructor G4() } public/*package*/ interface G5 { } - public/*package*/ open inner class G6 { - public/*package*/ constructor G6() + public/*package*/ open inner class G6 { + public/*package*/ constructor G6() } public/*package*/ interface G7 where _A : test.ClassTypeParameterBounds.I2<@org.jetbrains.annotations.NotNull kotlin.Int>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt index 7cf68883d0e..90e8a566c61 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,17 +5,17 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ x: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ x: _A!!): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ x: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ x: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? - public/*package*/ open fun f4(/*0*/ x: _A, /*1*/ y: B!): kotlin.Unit + public/*package*/ open fun f4(/*0*/ x: _A, /*1*/ y: B!): kotlin.Unit public/*package*/ open fun f5(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit public/*package*/ open fun f6(): kotlin.Unit - public/*package*/ abstract fun f7(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit - public/*package*/ abstract fun f8(/*0*/ x1: _A, /*1*/ x2: B!, /*2*/ x3: C!, /*3*/ x4: D, /*4*/ x5: E!, /*5*/ x6: F!): kotlin.Unit + public/*package*/ abstract fun f7(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit + public/*package*/ abstract fun f8(/*0*/ x1: _A, /*1*/ x2: B!, /*2*/ x3: C!, /*3*/ x4: D, /*4*/ x5: E!, /*5*/ x6: F!): kotlin.Unit public/*package*/ open fun f9(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2<@org.jetbrains.annotations.Nullable kotlin.Int?>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ interface I1 { diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt index 7ca4886593d..5414d7a9bd8 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt @@ -1,34 +1,34 @@ fun valuesNotNull(map: MutableMap) { map.computeIfPresent(1) { k, v -> v.length.toString() ?: null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesNullable(map: MutableMap) { map.computeIfPresent(1) { k, v -> v?.length?.toString() } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesT(map: MutableMap, newValue: T) { map.computeIfPresent(1) { k, v -> v?.length.toString() ?: null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNotNull(map: MutableMap, newValue: T) { map.computeIfPresent(1) { k, v -> null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNullable(map: MutableMap, newValue: T?) { map.computeIfPresent(1) { k, v -> null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt index 928103818aa..a9df1466e2d 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt @@ -1,42 +1,42 @@ fun valuesNotNull(map: MutableMap) { map.merge(1, "x") { old, new -> old + new } // SUCCESS - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, String, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesNullable(map: MutableMap) { map.merge(1, "x") { old, new -> old + new } // SUCCESS - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, String, BiFunction): String? defined in kotlin.collections.MutableMap map.merge(1, null) { old, new -> old + new } // UNSAFE_CALL_ERROR - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, String, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesT(map: MutableMap, newValue: T) { map.merge(1, newValue) { old, new -> null } // OTHER_ERROR - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun merge(Int, T!!, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun merge(Int, T & Any, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNotNull(map: MutableMap, newValue: T) { map.merge(1, newValue) { old, new -> null } // SUCCESS - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, T, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNullable(map: MutableMap, newValue: T?) { map.merge(1, newValue) { old, new -> new } // UNSAFE_CALL_ERROR - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun merge(Int, T!!, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun merge(Int, T & Any, BiFunction): T? defined in kotlin.collections.MutableMap map.merge(1, newValue!!) { old, new -> new } // SUCCESS - // ORIGINAL: fun merge(K, V!!, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun merge(Int, T!!, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun merge(Int, T & Any, BiFunction): T? defined in kotlin.collections.MutableMap } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt index 79f01db1c87..4e9621d537f 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt @@ -3,11 +3,11 @@ import java.util.* fun use() { Optional.empty() // SUCCESS - // ORIGINAL: fun empty(): Optional defined in java.util.Optional + // ORIGINAL: fun empty(): Optional defined in java.util.Optional // SUBSTITUTED: fun empty(): Optional defined in java.util.Optional Optional.empty() // SUCCESS - // ORIGINAL: fun empty(): Optional defined in java.util.Optional + // ORIGINAL: fun empty(): Optional defined in java.util.Optional // SUBSTITUTED: fun empty(): Optional defined in java.util.Optional } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt index 8ce7d0815a7..f4d248535f4 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt @@ -3,14 +3,14 @@ import java.util.* fun use(v: Optional) { v.get() // SUCCESS - // ORIGINAL: fun get(): T!! defined in java.util.Optional + // ORIGINAL: fun get(): T & Any defined in java.util.Optional // SUBSTITUTED: fun get(): String defined in java.util.Optional } fun use2(v: Optional) { v.get() // SUCCESS - // ORIGINAL: fun get(): T!! defined in java.util.Optional + // ORIGINAL: fun get(): T & Any defined in java.util.Optional // SUBSTITUTED: fun get(): String defined in java.util.Optional } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt index 180770ea25a..b4b22694421 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt @@ -3,14 +3,14 @@ import java.util.* fun use(v: Optional) { v.ifPresent { value -> } // SUCCESS - // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional + // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional // SUBSTITUTED: fun ifPresent(Consumer): Unit defined in java.util.Optional } fun use2(v: Optional) { v.ifPresent { value -> } // SUCCESS - // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional + // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional // SUBSTITUTED: fun ifPresent(Consumer): Unit defined in java.util.Optional } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt index a1e20aa7326..41b4a5a6fc9 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt @@ -4,16 +4,16 @@ fun use() { val x: String? = "x" Optional.of(x) // SUCCESS - // ORIGINAL: fun of(T!!): Optional defined in java.util.Optional + // ORIGINAL: fun of(T & Any): Optional defined in java.util.Optional // SUBSTITUTED: fun of(String): Optional defined in java.util.Optional Optional.of(x!!) // SUCCESS - // ORIGINAL: fun of(T!!): Optional defined in java.util.Optional + // ORIGINAL: fun of(T & Any): Optional defined in java.util.Optional // SUBSTITUTED: fun of(String): Optional defined in java.util.Optional Optional.ofNullable(x) // SUCCESS - // ORIGINAL: fun ofNullable(T?): Optional defined in java.util.Optional + // ORIGINAL: fun ofNullable(T?): Optional defined in java.util.Optional // SUBSTITUTED: fun ofNullable(String?): Optional defined in java.util.Optional } diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/subtyping/subtyping-for-intersection-types/p-1/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/type-system/subtyping/subtyping-for-intersection-types/p-1/pos/1.3.kt index 4e109f90617..b3011589756 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/type-system/subtyping/subtyping-for-intersection-types/p-1/pos/1.3.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/subtyping/subtyping-for-intersection-types/p-1/pos/1.3.kt @@ -36,7 +36,7 @@ fun case2(x: T) { checkSubtype(x) x //NI A2 & B2 & T & T!! OI A2 & B2 & T - x + x } } @@ -50,7 +50,7 @@ fun case3a(x: T) { checkSubtype(x) checkSubtype(x) checkSubtype(x) - x + x } } fun case3b(x: T) { @@ -70,7 +70,7 @@ fun case3c(x: T) { checkSubtype(x) checkSubtype(x) - x + x } } @@ -127,4 +127,4 @@ interface B6 fun C6?.foo(vararg x: Int) = println("hehe") -class C6 : A6, B6 {} \ No newline at end of file +class C6 : A6, B6 {} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.kt index 2d572288d9e..9219df3bc1b 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/42.kt @@ -72,8 +72,8 @@ fun case_5(x: Any?) { */ fun case_6(x: T) { if (x is Int || x is Float) { - x - x.toByte() + x + x.toByte() } } @@ -147,8 +147,8 @@ fun case_12(x: Any) { */ fun case_13(x: T) { if (x !is Int && x !is Float) throw Exception() - x - x.toByte() + x + x.toByte() } /* @@ -165,4 +165,4 @@ fun case_14(x: Any) { x.inv() } } -} \ No newline at end of file +} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt index 9b3e5f24816..bc6b9c4eaac 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt @@ -23,16 +23,16 @@ fun T.case_1() { apply { funT() } apply { funAny() } apply { funNullableT() } - apply { funNullableAny(); this.equals(null) } - also { it.equals(null) } - also { it.propT } - also { it.propAny } - also { it.propNullableT } - also { it.propNullableAny } - also { it.funT() } - also { it.funAny() } - also { it.funNullableT() } - also { it.funNullableAny() } + apply { funNullableAny(); this.equals(null) } + also { it.equals(null) } + also { it.propT } + also { it.propAny } + also { it.propNullableT } + also { it.propNullableAny } + also { it.funT() } + also { it.funAny() } + also { it.funNullableT() } + also { it.funNullableAny() } } } @@ -48,48 +48,48 @@ fun T?.case_2() { apply { funT() } apply { funAny() } apply { funNullableT() } - apply { funNullableAny(); this.equals(null) } - also { it.equals(null) } - also { it.propT } - also { it.propAny } - also { it.propNullableT } - also { it.propNullableAny } - also { it.funT() } - also { it.funAny() } - also { it.funNullableT() } - also { it.funNullableAny() } + apply { funNullableAny(); this.equals(null) } + also { it.equals(null) } + also { it.propT } + also { it.propAny } + also { it.propNullableT } + also { it.propNullableAny } + also { it.funT() } + also { it.funAny() } + also { it.funNullableT() } + also { it.funNullableAny() } } } // TESTCASE NUMBER: 3 fun T.case_3() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() } } // TESTCASE NUMBER: 4 fun T?.case_4() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() } } @@ -97,23 +97,23 @@ fun T?.case_4() { fun T?.case_5() { if (this is Interface1) { if (this != null) { - this + this this.equals(null) this.propT this.propAny - this.propNullableT - this.propNullableAny + this.propNullableT + this.propNullableAny this.funT() this.funAny() - this.funNullableT() - this.funNullableAny() + this.funNullableT() + this.funNullableAny() this.itest1() equals(this) itest1() apply { - this - this + this + this equals(null) propT propAny @@ -124,30 +124,30 @@ fun T?.case_5() { funNullableT() funNullableAny() itest1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() } also { - it - it - it.itest1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it + it.itest1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -157,22 +157,22 @@ fun T?.case_5() { fun T?.case_6() { if (this is Interface1?) { if (this != null) { - this + this this.equals(null) this.propT this.propAny - this.propNullableT - this.propNullableAny + this.propNullableT + this.propNullableAny this.funT() this.funAny() - this.funNullableT() - this.funNullableAny() + this.funNullableT() + this.funNullableAny() this.itest1() equals(this) itest1() apply { - this + this equals(null) propT propAny @@ -183,29 +183,29 @@ fun T?.case_6() { funNullableT() funNullableAny() itest1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() } also { - it - it.itest1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -216,20 +216,20 @@ fun T.case_7() { val x = this if (x is Interface1?) { if (x != null) { - x + x x.equals(null) x.propT x.propAny - x.propNullableT - x.propNullableAny + x.propNullableT + x.propNullableAny x.funT() x.funAny() - x.funNullableT() - x.funNullableAny() + x.funNullableT() + x.funNullableAny() x.itest1() x.apply { - this + this equals(null) propT propAny @@ -240,29 +240,29 @@ fun T.case_7() { funNullableT() funNullableAny() itest1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() } x.also { - it - it.itest1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -272,22 +272,22 @@ fun T.case_7() { fun T.case_8() { if (this != null) { if (this is Interface1?) { - this + this this.equals(null) this.propT this.propAny - this.propNullableT - this.propNullableAny + this.propNullableT + this.propNullableAny this.funT() this.funAny() - this.funNullableT() - this.funNullableAny() + this.funNullableT() + this.funNullableAny() this.itest1() equals(this) itest1() apply { - this + this equals(null) propT propAny @@ -298,29 +298,29 @@ fun T.case_8() { funNullableT() funNullableAny() itest1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() } also { - it - it.itest1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -401,22 +401,22 @@ fun T.case_9() { // TESTCASE NUMBER: 10 fun T.case_10() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.toByte() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.toByte() equals(this) toByte() apply { - this + this equals(null) propT propAny @@ -427,29 +427,29 @@ fun T.case_10() { funNullableT() funNullableAny() toByte() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.toByte() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.toByte() } also { - it - it.toByte() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.toByte() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -458,16 +458,16 @@ fun T.case_10() { fun T?.case_11() { if (this is Interface1?) { if (this != null) { - this + this this.equals(null) this.propT this.propAny - this.propNullableT - this.propNullableAny + this.propNullableT + this.propNullableAny this.funT() this.funAny() - this.funNullableT() - this.funNullableAny() + this.funNullableT() + this.funNullableAny() this.itest1() equals(this) @@ -515,23 +515,23 @@ fun T?.case_11() { // TESTCASE NUMBER: 12 fun T.case_12() where T : Number?, T: Interface1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() - this.toByte() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() + this.toByte() equals(this) itest1() apply { - this + this equals(null) propT propAny @@ -542,29 +542,29 @@ fun T.case_12() where T : Number?, T: Interface1? { funNullableT() funNullableAny() itest1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() } also { - it - it.itest1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -657,22 +657,22 @@ fun T.case_13() where T : Out<*>?, T: Comparable { */ fun ?> T.case_14() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() equals(this) get() apply { - this + this equals(null) propT propAny @@ -683,29 +683,29 @@ fun ?> T.case_14() { funNullableT() funNullableAny() get() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() } also { - it - it.get() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.get() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -717,22 +717,22 @@ fun ?> T.case_14() { */ fun ?> T.case_15() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() equals(this) itest1() apply { - this + this equals(null) propT propAny @@ -743,29 +743,29 @@ fun ?> T.case_15() { funNullableT() funNullableAny() itest1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() } also { - it - it.itest1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -777,22 +777,22 @@ fun ?> T.case_15() { */ fun ?> T.case_16() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() equals(this) ip1test1() apply { - this + this equals(null) propT propAny @@ -803,29 +803,29 @@ fun ?> T.case_16() { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -837,22 +837,22 @@ fun ?> T.case_16() { */ fun ?> T.case_17() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() equals(this) ip1test1() apply { - this + this equals(null) propT propAny @@ -863,29 +863,29 @@ fun ?> T.case_17() { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -899,17 +899,17 @@ fun ?> T.case_18() { val y = this if (y != null) { - y - y.equals(null) - y.propT - y.propAny - y.propNullableT - y.propNullableAny - y.funT() - y.funAny() - y.funNullableT() - y.funNullableAny() - y.ip1test1() + y + y.equals(null) + y.propT + y.propAny + y.propNullableT + y.propNullableAny + y.funT() + y.funAny() + y.funNullableT() + y.funNullableAny() + y.ip1test1() equals(y) ip1test1() @@ -951,22 +951,22 @@ fun ?> T.case_18() { */ fun ?> T.case_19() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() equals(this) ip1test1() apply { - this + this equals(null) propT propAny @@ -977,29 +977,29 @@ fun ?> T.case_19() { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -1011,24 +1011,24 @@ fun ?> T.case_19() { */ fun T.case_20() where T: InterfaceWithTypeParameter1?, T: InterfaceWithTypeParameter2? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() - this.ip1test2() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() + this.ip1test2() equals(this) ip1test1() ip1test2() apply { - this + this equals(null) propT propAny @@ -1040,31 +1040,31 @@ fun T.case_20() where T: InterfaceWithTypeParameter1?, T: InterfaceWit funNullableAny() ip1test1() ip1test2() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() - this.ip1test2() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() + this.ip1test2() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() - it.ip1test2() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() + it.ip1test2() } } } @@ -1076,26 +1076,26 @@ fun T.case_20() where T: InterfaceWithTypeParameter1?, T: InterfaceWit */ fun T.case_21() where T: InterfaceWithTypeParameter1?, T: InterfaceWithTypeParameter2?, T: InterfaceWithTypeParameter3? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() - this.ip1test2() - this.ip1test3() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() + this.ip1test2() + this.ip1test3() equals(this) ip1test1() ip1test2() ip1test3() apply { - this + this equals(null) propT propAny @@ -1108,33 +1108,33 @@ fun T.case_21() where T: InterfaceWithTypeParameter1?, T: InterfaceWit ip1test1() ip1test2() ip1test3() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() - this.ip1test2() - this.ip1test3() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() + this.ip1test2() + this.ip1test3() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() - it.ip1test2() - it.ip1test3() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() + it.ip1test2() + it.ip1test3() } } } @@ -1148,17 +1148,17 @@ fun >?> T.case var y = this if (y != null) { - y - y.equals(null) - y.propT - y.propAny - y.propNullableT - y.propNullableAny - y.funT() - y.funAny() - y.funNullableT() - y.funNullableAny() - y.ip1test1() + y + y.equals(null) + y.propT + y.propAny + y.propNullableT + y.propNullableAny + y.funT() + y.funAny() + y.funNullableT() + y.funNullableAny() + y.ip1test1() equals(y) ip1test1() @@ -1196,22 +1196,22 @@ fun >?> T.case // TESTCASE NUMBER: 23 fun >?> T.case_23() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() equals(this) ip1test1() apply { - this + this equals(null) propT propAny @@ -1222,29 +1222,29 @@ fun >?> T.case funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() } } } @@ -2722,24 +2722,24 @@ fun InterfaceWithFiveTypeParameters1?.case_44() { // TESTCASE NUMBER: 45 fun T.case_45() where T : Number?, T: Comparable? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.toByte() - this.compareTo(this) + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.toByte() + this.compareTo(this) equals(this) toByte() compareTo(this) apply { - this + this equals(null) propT propAny @@ -2751,31 +2751,31 @@ fun T.case_45() where T : Number?, T: Comparable? { funNullableAny() compareTo(this) toByte() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.compareTo(this) - this.toByte() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.compareTo(this) + this.toByte() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.compareTo(it) - it.toByte() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.compareTo(it) + it.toByte() } } } @@ -2783,26 +2783,26 @@ fun T.case_45() where T : Number?, T: Comparable? { // TESTCASE NUMBER: 46 fun T.case_46() where T : CharSequence?, T: Comparable?, T: Iterable<*>? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.compareTo(this) - this.get(0) - this.iterator() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.compareTo(this) + this.get(0) + this.iterator() equals(this) compareTo(this) get(0) iterator() apply { - this + this equals(null) propT propAny @@ -2815,33 +2815,33 @@ fun T.case_46() where T : CharSequence?, T: Comparable?, T: Iterable<*>? compareTo(this) get(0) iterator() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.compareTo(this) - this.get(0) - this.iterator() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.compareTo(this) + this.get(0) + this.iterator() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.compareTo(it) - it.get(0) - it.iterator() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.compareTo(it) + it.get(0) + it.iterator() } } } @@ -2853,24 +2853,24 @@ fun T.case_46() where T : CharSequence?, T: Comparable?, T: Iterable<*>? */ fun T?.case_47() where T : Inv, T: Comparable<*>?, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -2882,43 +2882,43 @@ fun T?.case_47() where T : Inv, T: Comparable<*>?, T: InterfaceWithTypePa funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } - this.compareTo(return) + this.compareTo(return) compareTo(return) apply { compareTo(return) - this.compareTo(return) + this.compareTo(return) } also { - it.compareTo(return) + it.compareTo(return) } } } @@ -2930,24 +2930,24 @@ fun T?.case_47() where T : Inv, T: Comparable<*>?, T: InterfaceWithTypePa */ fun T?.case_48() where T : Inv, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -2959,31 +2959,31 @@ fun T?.case_48() where T : Inv, T: InterfaceWithTypeParameter1? funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -2995,24 +2995,24 @@ fun T?.case_48() where T : Inv, T: InterfaceWithTypeParameter1? */ fun T?.case_49() where T : Inv, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3024,31 +3024,31 @@ fun T?.case_49() where T : Inv, T: InterfaceWithTypeParameter1? funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3060,24 +3060,24 @@ fun T?.case_49() where T : Inv, T: InterfaceWithTypeParameter1? */ fun T?.case_50() where T : Inv, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3089,31 +3089,31 @@ fun T?.case_50() where T : Inv, T: InterfaceWithTypeParameter1 funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3125,24 +3125,24 @@ fun T?.case_50() where T : Inv, T: InterfaceWithTypeParameter1 */ fun T?.case_51() where T : Inv, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3154,31 +3154,31 @@ fun T?.case_51() where T : Inv, T: InterfaceWithTypeParameter1? { funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3186,24 +3186,24 @@ fun T?.case_51() where T : Inv, T: InterfaceWithTypeParameter1? { // TESTCASE NUMBER: 52 fun T?.case_52() where T : Inv, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3215,31 +3215,31 @@ fun T?.case_52() where T : Inv, T: InterfaceWithTypeParameter1? { funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3251,24 +3251,24 @@ fun T?.case_52() where T : Inv, T: InterfaceWithTypeParameter1? { */ fun T?.case_53() where T : Inv, T: InterfaceWithTypeParameter1<*>? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3280,31 +3280,31 @@ fun T?.case_53() where T : Inv, T: InterfaceWithTypeParameter1<*>? { funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3316,24 +3316,24 @@ fun T?.case_53() where T : Inv, T: InterfaceWithTypeParameter1<*>? { */ fun T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3345,31 +3345,31 @@ fun T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1? { funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3377,24 +3377,24 @@ fun T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1? { // TESTCASE NUMBER: 55 fun T?.case_55() where T : Inv<*>, T: InterfaceWithTypeParameter1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() equals(this) get() ip1test1() apply { - this + this equals(null) propT propAny @@ -3406,31 +3406,31 @@ fun T?.case_55() where T : Inv<*>, T: InterfaceWithTypeParameter1? { funNullableAny() get() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.get() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.get() + it.ip1test1() } } } @@ -3438,24 +3438,24 @@ fun T?.case_55() where T : Inv<*>, T: InterfaceWithTypeParameter1? { // TESTCASE NUMBER: 56 fun T.case_56() where T : Number?, T: Interface1? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() - this.toByte() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() + this.toByte() equals(this) itest() toByte() apply { - this + this equals(null) propT propAny @@ -3467,31 +3467,31 @@ fun T.case_56() where T : Number?, T: Interface1? { funNullableAny() itest() toByte() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() - this.toByte() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() + this.toByte() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.itest() - it.toByte() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.itest() + it.toByte() } } } @@ -3580,22 +3580,22 @@ fun T.case_57() where T : Out<*>?, T: Comparable { // TESTCASE NUMBER: 58 fun >>>>>>>>>?> T.case_59() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() equals(this) ip1test1() apply { - this + this equals(null) propT propAny @@ -3606,29 +3606,29 @@ fun this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() } } } @@ -3640,26 +3640,26 @@ fun T.case_59() where T: InterfaceWithFiveTypeParameters1?, T: InterfaceWithFiveTypeParameters2?, T: InterfaceWithFiveTypeParameters3? { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() - this.itest2() - this.itest3() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() + this.itest2() + this.itest3() equals(this) itest1() itest2() itest3() apply { - this + this equals(null) propT propAny @@ -3672,33 +3672,33 @@ fun T.case_59() where T: InterfaceWithFiveTypeParameters1this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() - this.itest2() - this.itest3() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() + this.itest2() + this.itest3() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.itest1() - it.itest2() - it.itest3() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.itest1() + it.itest2() + it.itest3() } } } @@ -3710,22 +3710,22 @@ fun T.case_59() where T: InterfaceWithFiveTypeParameters1?> T.case_60() { if (this != null) { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() equals(this) ip1test1() apply { - this + this equals(null) propT propAny @@ -3736,29 +3736,29 @@ fun ?> T.case_60() { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() } } } @@ -3775,32 +3775,32 @@ class Case61_3: InterfaceWithTypeParameter1, Case61_1, Case61_2 { fun T.case_61() where T : InterfaceWithTypeParameter1?, T: Case61_3?, T: Case61_1?, T: Case61_2? { if (this != null) { - this.test1() - this.test2() - this.ip1test1() - this.test4() + this.test1() + this.test2() + this.ip1test1() + this.test4() test1() test2() ip1test1() test4() apply { - this + this test1() test2() ip1test1() test4() - this.test1() - this.test2() - this.ip1test1() - this.test4() + this.test1() + this.test2() + this.ip1test1() + this.test4() } also { - it - it.test1() - it.test2() - it.ip1test1() - it.test4() + it + it.test1() + it.test2() + it.ip1test1() + it.test4() } } } @@ -3849,18 +3849,18 @@ fun Nothing.case_63() { */ fun T.case_64() { if (this != null) { - this - this.hashCode() + this + this.hashCode() hashCode() apply { - this + this hashCode() - this.hashCode() + this.hashCode() } also { - it - it.hashCode() + it + it.hashCode() } } } @@ -3874,39 +3874,39 @@ fun T.case_65() { if (this is Interface1?) { if (this is Interface2?) { if (this != null) { - this + this this.equals(null) this.propT this.propAny - this.propNullableT - this.propNullableAny + this.propNullableT + this.propNullableAny this.funT() this.funAny() - this.funNullableT() - this.funNullableAny() + this.funNullableT() + this.funNullableAny() apply { - this - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() + this + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() } also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt index 2647f5a8890..d5c94d1a591 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt @@ -16,100 +16,100 @@ fun case_1(x: T) { var y = null if (y != x) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.apply { equals(null) } - x.apply { propT } - x.apply { propAny } - x.apply { propNullableT } - x.apply { propNullableAny } - x.apply { funT() } - x.apply { funAny() } - x.apply { funNullableT() } - x.apply { funNullableAny(); x.equals(null) } - x.also { it.equals(null) } - x.also { it.propT } - x.also { it.propAny } - x.also { it.propNullableT } - x.also { it.propNullableAny } - x.also { it.funT() } - x.also { it.funAny() } - x.also { it.funNullableT() } - x.also { it.funNullableAny() } + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.apply { equals(null) } + x.apply { propT } + x.apply { propAny } + x.apply { propNullableT } + x.apply { propNullableAny } + x.apply { funT() } + x.apply { funAny() } + x.apply { funNullableT() } + x.apply { funNullableAny(); x.equals(null) } + x.also { it.equals(null) } + x.also { it.propT } + x.also { it.propAny } + x.also { it.propNullableT } + x.also { it.propNullableAny } + x.also { it.funT() } + x.also { it.funAny() } + x.also { it.funNullableT() } + x.also { it.funNullableAny() } } } // TESTCASE NUMBER: 2 fun case_2(x: T?, y: Nothing?) { if (y != x) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.apply { equals(null) } - x.apply { propT } - x.apply { propAny } - x.apply { propNullableT } - x.apply { propNullableAny } - x.apply { funT() } - x.apply { funAny() } - x.apply { funNullableT() } - x.apply { funNullableAny(); x.equals(null) } - x.also { it.equals(null) } - x.also { it.propT } - x.also { it.propAny } - x.also { it.propNullableT } - x.also { it.propNullableAny } - x.also { it.funT() } - x.also { it.funAny() } - x.also { it.funNullableT() } - x.also { it.funNullableAny() } + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.apply { equals(null) } + x.apply { propT } + x.apply { propAny } + x.apply { propNullableT } + x.apply { propNullableAny } + x.apply { funT() } + x.apply { funAny() } + x.apply { funNullableT() } + x.apply { funNullableAny(); x.equals(null) } + x.also { it.equals(null) } + x.also { it.propT } + x.also { it.propAny } + x.also { it.propNullableT } + x.also { it.propNullableAny } + x.also { it.funT() } + x.also { it.funAny() } + x.also { it.funNullableT() } + x.also { it.funNullableAny() } } } // TESTCASE NUMBER: 3 fun case_3(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } } // TESTCASE NUMBER: 4 fun case_4(x: T?) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } } @@ -117,16 +117,16 @@ fun case_4(x: T?) { fun case_5(x: T?) { if (x is Interface1) { if (x != null) { - x + x x.equals(null) x.propT x.propAny - x.propNullableT - x.propNullableAny + x.propNullableT + x.propNullableAny x.funT() x.funAny() - x.funNullableT() - x.funNullableAny() + x.funNullableT() + x.funNullableAny() x.itest() x.equals(null) @@ -135,21 +135,21 @@ fun case_5(x: T?) { x.propAny - x.propNullableT + x.propNullableT - x.propNullableAny + x.propNullableAny x.funT() x.funAny() - x.funNullableT() + x.funNullableT() - x.funNullableAny() + x.funNullableAny() x.itest() x.apply { - this - this + this + this equals(null) propT propAny @@ -160,30 +160,30 @@ fun case_5(x: T?) { funNullableT() funNullableAny() itest() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() } x.also { - it - it - it.itest() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it + it.itest() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -193,16 +193,16 @@ fun case_5(x: T?) { fun case_6(x: T?) { if (x is Interface1?) { if (x != null) { - x + x x.equals(null) x.propT x.propAny - x.propNullableT - x.propNullableAny + x.propNullableT + x.propNullableAny x.funT() x.funAny() - x.funNullableT() - x.funNullableAny() + x.funNullableT() + x.funNullableAny() x.itest() x.equals(null) @@ -224,7 +224,7 @@ fun case_6(x: T?) { x.funNullableAny() x.itest() x.apply { - this + this equals(null) propT propAny @@ -235,29 +235,29 @@ fun case_6(x: T?) { funNullableT() funNullableAny() itest() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() } x.also { - it - it.itest() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -268,20 +268,20 @@ fun case_7(y: T) { val x = y if (x is Interface1?) { if (x != null) { - x + x x.equals(null) x.propT x.propAny - x.propNullableT - x.propNullableAny + x.propNullableT + x.propNullableAny x.funT() x.funAny() - x.funNullableT() - x.funNullableAny() + x.funNullableT() + x.funNullableAny() x.itest() x.apply { - this + this equals(null) propT propAny @@ -292,29 +292,29 @@ fun case_7(y: T) { funNullableT() funNullableAny() itest() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() } x.also { - it - it.itest() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -324,16 +324,16 @@ fun case_7(y: T) { fun case_8(x: T) { if (x != null) { if (x is Interface1?) { - x + x x.equals(null) x.propT x.propAny - x.propNullableT - x.propNullableAny + x.propNullableT + x.propNullableAny x.funT() x.funAny() - x.funNullableT() - x.funNullableAny() + x.funNullableT() + x.funNullableAny() x.itest() x.equals(null) @@ -355,7 +355,7 @@ fun case_8(x: T) { x.funNullableAny() x.itest() x.apply { - this + this equals(null) propT propAny @@ -366,29 +366,29 @@ fun case_8(x: T) { funNullableT() funNullableAny() itest() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() } x.also { - it - it.itest() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -469,17 +469,17 @@ fun case_9(x: T) { // TESTCASE NUMBER: 10 fun case_10(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.toByte() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.toByte() x.equals(null) @@ -500,7 +500,7 @@ fun case_10(x: T) { x.funNullableAny() x.toByte() x.apply { - this + this equals(null) propT propAny @@ -511,29 +511,29 @@ fun case_10(x: T) { funNullableT() funNullableAny() toByte() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.toByte() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.toByte() } x.also { - it - it.toByte() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.toByte() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -542,16 +542,16 @@ fun case_10(x: T) { fun case_11(x: T?) { if (x is Interface1?) { if (x != null) { - x + x x.equals(null) x.propT x.propAny - x.propNullableT - x.propNullableAny + x.propNullableT + x.propNullableAny x.funT() x.funAny() - x.funNullableT() - x.funNullableAny() + x.funNullableT() + x.funNullableAny() x.itest() x.equals(null) @@ -615,18 +615,18 @@ fun case_11(x: T?) { // TESTCASE NUMBER: 12 fun case_12(x: T) where T : Number?, T: Interface1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.itest() - x.toByte() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.itest() + x.toByte() x.equals(null) @@ -647,7 +647,7 @@ fun case_12(x: T) where T : Number?, T: Interface1? { x.funNullableAny() x.itest() x.apply { - this + this equals(null) propT propAny @@ -658,29 +658,29 @@ fun case_12(x: T) where T : Number?, T: Interface1? { funNullableT() funNullableAny() itest() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() } x.also { - it - it.itest() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -772,17 +772,17 @@ fun case_13(x: T) where T : Out<*>?, T: Comparable { */ fun ?> case_14(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.get() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.get() x.equals(null) @@ -803,7 +803,7 @@ fun ?> case_14(x: T) { x.funNullableAny() x.get() x.apply { - this + this equals(null) propT propAny @@ -814,29 +814,29 @@ fun ?> case_14(x: T) { funNullableT() funNullableAny() get() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.get() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.get() } x.also { - it - it.get() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.get() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -847,17 +847,17 @@ fun ?> case_14(x: T) { */ fun ?> case_15(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.itest() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.itest() x.equals(null) @@ -878,7 +878,7 @@ fun ?> case_15(x: T) { x.funNullableAny() x.itest() x.apply { - this + this equals(null) propT propAny @@ -889,29 +889,29 @@ fun ?> case_15(x: T) { funNullableT() funNullableAny() itest() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() } x.also { - it - it.itest() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.itest() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -922,17 +922,17 @@ fun ?> case_15(x: T) { */ fun ?> case_16(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() x.equals(null) @@ -953,7 +953,7 @@ fun ?> case_16(x: T) { x.funNullableAny() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -964,29 +964,29 @@ fun ?> case_16(x: T) { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -997,17 +997,17 @@ fun ?> case_16(x: T) { */ fun ?> case_17(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() x.equals(null) @@ -1028,7 +1028,7 @@ fun ?> case_17(x: T) { x.funNullableAny() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -1039,29 +1039,29 @@ fun ?> case_17(x: T) { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -1074,17 +1074,17 @@ fun ?> case_18(x: T) { val y = x if (y != null) { - y - y.equals(null) - y.propT - y.propAny - y.propNullableT - y.propNullableAny - y.funT() - y.funAny() - y.funNullableT() - y.funNullableAny() - y.ip1test1() + y + y.equals(null) + y.propT + y.propAny + y.propNullableT + y.propNullableAny + y.funT() + y.funAny() + y.funNullableT() + y.funNullableAny() + y.ip1test1() x.equals(null) @@ -1105,7 +1105,7 @@ fun ?> case_18(x: T) { x.funNullableAny() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -1116,29 +1116,29 @@ fun ?> case_18(x: T) { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -1149,17 +1149,17 @@ fun ?> case_18(x: T) { */ fun ?> case_19(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() x.equals(null) @@ -1180,7 +1180,7 @@ fun ?> case_19(x: T) { x.funNullableAny() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -1191,29 +1191,29 @@ fun ?> case_19(x: T) { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.ip1test1() - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() + it + it.ip1test1() + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() } } } @@ -1224,18 +1224,18 @@ fun ?> case_19(x: T) { */ fun case_20(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceWithTypeParameter2? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() - x.ip1test2() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() + x.ip1test2() x.equals(null) @@ -1257,7 +1257,7 @@ fun case_20(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceW x.ip1test1() x.ip1test2() x.apply { - this + this equals(null) propT propAny @@ -1269,31 +1269,31 @@ fun case_20(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceW funNullableAny() ip1test1() ip1test2() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() - this.ip1test2() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() + this.ip1test2() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() - it.ip1test2() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() + it.ip1test2() } } } @@ -1304,19 +1304,19 @@ fun case_20(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceW */ fun case_21(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceWithTypeParameter2?, T: InterfaceWithTypeParameter3? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() - x.ip1test2() - x.ip1test3() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() + x.ip1test2() + x.ip1test3() x.equals(null) @@ -1339,7 +1339,7 @@ fun case_21(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceW x.ip1test2() x.ip1test3() x.apply { - this + this equals(null) propT propAny @@ -1352,33 +1352,33 @@ fun case_21(x: T) where T: InterfaceWithTypeParameter1?, T: InterfaceW ip1test1() ip1test2() ip1test3() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() - this.ip1test2() - this.ip1test3() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() + this.ip1test2() + this.ip1test3() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() - it.ip1test2() - it.ip1test3() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() + it.ip1test2() + it.ip1test3() } } } @@ -1392,17 +1392,17 @@ fun >?> case_2 var y = x if (y != null) { - y - y.equals(null) - y.propT - y.propAny - y.propNullableT - y.propNullableAny - y.funT() - y.funAny() - y.funNullableT() - y.funNullableAny() - y.ip1test1() + y + y.equals(null) + y.propT + y.propAny + y.propNullableT + y.propNullableAny + y.funT() + y.funAny() + y.funNullableT() + y.funNullableAny() + y.ip1test1() x.equals(null) @@ -1456,17 +1456,17 @@ fun >?> case_2 // TESTCASE NUMBER: 23 fun >?> case_23(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() x.equals(null) @@ -1487,7 +1487,7 @@ fun >?> case_2 x.funNullableAny() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -1498,29 +1498,29 @@ fun >?> case_2 funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() } } } @@ -3030,18 +3030,18 @@ fun case_44(x: InterfaceWithFiveTypeParameters1?) { // TESTCASE NUMBER: 45 fun case_45(x: T) where T : Number?, T: Comparable? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.toByte() - x.compareTo(x) + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.toByte() + x.compareTo(x) x.equals(null) @@ -3063,7 +3063,7 @@ fun case_45(x: T) where T : Number?, T: Comparable? { x.toByte() x.compareTo(x) x.apply { - this + this equals(null) propT propAny @@ -3075,31 +3075,31 @@ fun case_45(x: T) where T : Number?, T: Comparable? { funNullableAny() compareTo(this) x.toByte() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.compareTo(x) - this.toByte() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.compareTo(x) + this.toByte() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.compareTo(it) - it.toByte() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.compareTo(it) + it.toByte() } } } @@ -3107,19 +3107,19 @@ fun case_45(x: T) where T : Number?, T: Comparable? { // TESTCASE NUMBER: 46 fun case_46(x: T) where T : CharSequence?, T: Comparable?, T: Iterable<*>? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.compareTo(x) - x.get(0) - x.iterator() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.compareTo(x) + x.get(0) + x.iterator() x.equals(null) @@ -3142,7 +3142,7 @@ fun case_46(x: T) where T : CharSequence?, T: Comparable?, T: Iterable<*> x.get(0) x.iterator() x.apply { - this + this equals(null) propT propAny @@ -3155,33 +3155,33 @@ fun case_46(x: T) where T : CharSequence?, T: Comparable?, T: Iterable<*> compareTo(this) get(0) iterator() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.compareTo(x) - this.get(0) - this.iterator() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.compareTo(x) + this.get(0) + this.iterator() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.compareTo(it) - it.get(0) - it.iterator() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.compareTo(it) + it.get(0) + it.iterator() } } } @@ -3192,18 +3192,18 @@ fun case_46(x: T) where T : CharSequence?, T: Comparable?, T: Iterable<*> */ fun case_47(x: T?) where T : Inv, T: Comparable<*>?, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3225,7 +3225,7 @@ fun case_47(x: T?) where T : Inv, T: Comparable<*>?, T: InterfaceWithType x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3237,43 +3237,43 @@ fun case_47(x: T?) where T : Inv, T: Comparable<*>?, T: InterfaceWithType funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } - x.compareTo(return) + x.compareTo(return) x.compareTo(return) x.apply { compareTo(return) - this.compareTo(return) + this.compareTo(return) } x.also { - it.compareTo(return) + it.compareTo(return) } } } @@ -3284,18 +3284,18 @@ fun case_47(x: T?) where T : Inv, T: Comparable<*>?, T: InterfaceWithType */ fun case_48(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3317,7 +3317,7 @@ fun case_48(x: T?) where T : Inv, T: InterfaceWithTypeParameter1x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3329,31 +3329,31 @@ fun case_48(x: T?) where T : Inv, T: InterfaceWithTypeParameter1this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3364,18 +3364,18 @@ fun case_48(x: T?) where T : Inv, T: InterfaceWithTypeParameter1 case_49(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3397,7 +3397,7 @@ fun case_49(x: T?) where T : Inv, T: InterfaceWithTypeParameter1 x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3409,31 +3409,31 @@ fun case_49(x: T?) where T : Inv, T: InterfaceWithTypeParameter1 funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3444,18 +3444,18 @@ fun case_49(x: T?) where T : Inv, T: InterfaceWithTypeParameter1 */ fun case_50(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3477,7 +3477,7 @@ fun case_50(x: T?) where T : Inv, T: InterfaceWithTypeParameter1x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3489,31 +3489,31 @@ fun case_50(x: T?) where T : Inv, T: InterfaceWithTypeParameter1this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3524,18 +3524,18 @@ fun case_50(x: T?) where T : Inv, T: InterfaceWithTypeParameter1 case_51(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3557,7 +3557,7 @@ fun case_51(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3569,31 +3569,31 @@ fun case_51(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3601,18 +3601,18 @@ fun case_51(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? // TESTCASE NUMBER: 52 fun case_52(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3634,7 +3634,7 @@ fun case_52(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3646,31 +3646,31 @@ fun case_52(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3681,18 +3681,18 @@ fun case_52(x: T?) where T : Inv, T: InterfaceWithTypeParameter1? { */ fun case_53(x: T?) where T : Inv, T: InterfaceWithTypeParameter1<*>? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3714,7 +3714,7 @@ fun case_53(x: T?) where T : Inv, T: InterfaceWithTypeParameter1<*>? { x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3726,31 +3726,31 @@ fun case_53(x: T?) where T : Inv, T: InterfaceWithTypeParameter1<*>? { funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3761,18 +3761,18 @@ fun case_53(x: T?) where T : Inv, T: InterfaceWithTypeParameter1<*>? { */ fun case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3794,7 +3794,7 @@ fun case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3806,31 +3806,31 @@ fun case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3838,18 +3838,18 @@ fun case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? // TESTCASE NUMBER: 55 fun case_55(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.test() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.test() + x.ip1test1() x.equals(null) @@ -3871,7 +3871,7 @@ fun case_55(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? { x.test() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -3883,31 +3883,31 @@ fun case_55(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? { funNullableAny() test() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.test() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.test() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.test() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.test() + it.ip1test1() } } } @@ -3915,18 +3915,18 @@ fun case_55(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1? { // TESTCASE NUMBER: 56 fun case_56(x: T) where T : Number?, T: Interface1? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.itest() - x.toByte() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.itest() + x.toByte() x.equals(null) @@ -3948,7 +3948,7 @@ fun case_56(x: T) where T : Number?, T: Interface1? { x.itest() x.toByte() x.apply { - this + this equals(null) propT propAny @@ -3960,31 +3960,31 @@ fun case_56(x: T) where T : Number?, T: Interface1? { funNullableAny() itest() x.toByte() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest() - this.toByte() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest() + this.toByte() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.itest() - it.toByte() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.itest() + it.toByte() } } } @@ -4073,17 +4073,17 @@ fun case_57(x: T) where T : Out<*>?, T: Comparable { // TESTCASE NUMBER: 58 fun >>>>>>>>>?> case_59(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() x.equals(null) @@ -4104,7 +4104,7 @@ fun x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -4115,29 +4115,29 @@ fun this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() } } } @@ -4148,19 +4148,19 @@ fun case_59(x: T) where T: InterfaceWithFiveTypeParameters1?, T: InterfaceWithFiveTypeParameters2?, T: InterfaceWithFiveTypeParameters3? { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.itest1() - x.itest2() - x.itest3() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.itest1() + x.itest2() + x.itest3() x.equals(null) @@ -4183,7 +4183,7 @@ fun case_59(x: T) where T: InterfaceWithFiveTypeParameters1x.itest2() x.itest3() x.apply { - this + this equals(null) propT propAny @@ -4196,33 +4196,33 @@ fun case_59(x: T) where T: InterfaceWithFiveTypeParameters1this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.itest1() - this.itest2() - this.itest3() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.itest1() + this.itest2() + this.itest3() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.itest1() - it.itest2() - it.itest3() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.itest1() + it.itest2() + it.itest3() } } } @@ -4233,17 +4233,17 @@ fun case_59(x: T) where T: InterfaceWithFiveTypeParameters1?> case_60(x: T) { if (x != null) { - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() - x.ip1test1() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() + x.ip1test1() x.equals(null) @@ -4264,7 +4264,7 @@ fun ?> case_60(x: T) { x.funNullableAny() x.ip1test1() x.apply { - this + this equals(null) propT propAny @@ -4275,29 +4275,29 @@ fun ?> case_60(x: T) { funNullableT() funNullableAny() ip1test1() - this.equals(null) - this.propT - this.propAny - this.propNullableT - this.propNullableAny - this.funT() - this.funAny() - this.funNullableT() - this.funNullableAny() - this.ip1test1() + this.equals(null) + this.propT + this.propAny + this.propNullableT + this.propNullableAny + this.funT() + this.funAny() + this.funNullableT() + this.funNullableAny() + this.ip1test1() } x.also { - it - it.equals(null) - it.propT - it.propAny - it.propNullableT - it.propNullableAny - it.funT() - it.funAny() - it.funNullableT() - it.funNullableAny() - it.ip1test1() + it + it.equals(null) + it.propT + it.propAny + it.propNullableT + it.propNullableAny + it.funT() + it.funAny() + it.funNullableT() + it.funNullableAny() + it.ip1test1() } } } @@ -4314,32 +4314,32 @@ class Case61_3: InterfaceWithTypeParameter1, Case61_1, Case61_2 { fun T.case_61(x: T) where T : InterfaceWithTypeParameter1?, T: Case61_3?, T: Case61_1?, T: Case61_2? { if (x != null) { - x.ip1test1() - x.test2() - x.ip1test1() - x.test4() + x.ip1test1() + x.test2() + x.ip1test1() + x.test4() x.ip1test1() x.test2() x.ip1test1() x.test4() x.apply { - this + this ip1test1() test2() ip1test1() test4() - this.ip1test1() - this.test2() - this.ip1test1() - this.test4() + this.ip1test1() + this.test2() + this.ip1test1() + this.test4() } x.also { - it - it.ip1test1() - it.test2() - it.ip1test1() - it.test4() + it + it.ip1test1() + it.test2() + it.ip1test1() + it.test4() } } } @@ -4350,18 +4350,18 @@ fun T.case_61(x: T) where T : InterfaceWithTypeParameter1?, T: Case61_3 case_62(x: T) { if (x != null) { - x - x.hashCode() + x + x.hashCode() x.hashCode() x.apply { - this + this hashCode() - this.hashCode() + this.hashCode() } x.also { - it - it.hashCode() + it + it.hashCode() } } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt index cc73ab02acb..774338f6004 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt @@ -47,15 +47,15 @@ fun case_3(vararg x: T?) { fun case_4(vararg x: T?) { x[0].apply { if (this != null) { - this - this.toByte() + this + this.toByte() } } x[0].also { if (it != null) { - it - it.toByte() + it + it.toByte() } } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.kt index 6d9ef8ee488..7a9534b4292 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/16.kt @@ -282,31 +282,31 @@ fun case_20(x: Inv>> // TESTCASE NUMBER: 21 fun case_21(x: T) { if (x == null) return - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } // TESTCASE NUMBER: 22 fun case_22(x: T?) { if (x === null) return - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } // TESTCASE NUMBER: 23 @@ -669,16 +669,16 @@ fun case_44(x: Inv>> fun case_45(x: T) { val y = (l@ { if (x == null) return@l - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() })() } @@ -686,16 +686,16 @@ fun case_45(x: T) { fun case_46(x: T?) { (l@ { if (x === null) return@l - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() })() } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/17.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/17.kt index 3ce2fab8a8e..b5d86277a2b 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/17.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/17.kt @@ -281,31 +281,31 @@ fun case_20(x: Inv>> // TESTCASE NUMBER: 21 fun case_21(x: T) { if (x == null) throw Exception() - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } // TESTCASE NUMBER: 22 fun case_22(x: T?) { if (x === null) throw Exception() - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } // TESTCASE NUMBER: 23 diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.kt index 936b9c2e2b6..f17fe50ee8c 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/18.kt @@ -235,16 +235,16 @@ fun case_16(map: Map) { fun case_17(x: T?, f: Boolean) { while (f) { if (x === implicitNullableNothingProperty || false) { break } - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } } @@ -252,16 +252,16 @@ fun case_17(x: T?, f: Boolean) { fun case_18(x: T, f: Boolean) { while (f) { if (false || false || false || x == nullableNothingProperty) break - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } } @@ -269,26 +269,26 @@ fun case_18(x: T, f: Boolean) { fun case_19(map: MutableMap, y: Nothing?) { for ((k, v) in map) { if (k !== implicitNullableNothingProperty && true && v != y) else { break } - k - k.equals(null) - k.propT - k.propAny - k.propNullableT - k.propNullableAny - k.funT() - k.funAny() - k.funNullableT() - k.funNullableAny() - v - v.equals(null) - v.propT - v.propAny - v.propNullableT - v.propNullableAny - v.funT() - v.funAny() - v.funNullableT() - v.funNullableAny() + k + k.equals(null) + k.propT + k.propAny + k.propNullableT + k.propNullableAny + k.funT() + k.funAny() + k.funNullableT() + k.funNullableAny() + v + v.equals(null) + v.propT + v.propAny + v.propNullableT + v.propNullableAny + v.funT() + v.funAny() + v.funNullableT() + v.funNullableAny() } } @@ -296,26 +296,26 @@ fun case_19(map: MutableMap, y: Nothing?) { fun case_20(map: MutableMap) { for ((k, v) in map) { if (true && true && true && k !== null && v != null && true) else continue - k - k.equals(null) - k.propT - k.propAny - k.propNullableT - k.propNullableAny - k.funT() - k.funAny() - k.funNullableT() - k.funNullableAny() - v - v.equals(null) - v.propT - v.propAny - v.propNullableT - v.propNullableAny - v.funT() - v.funAny() - v.funNullableT() - v.funNullableAny() + k + k.equals(null) + k.propT + k.propAny + k.propNullableT + k.propNullableAny + k.funT() + k.funAny() + k.funNullableT() + k.funNullableAny() + v + v.equals(null) + v.propT + v.propAny + v.propNullableT + v.propNullableAny + v.funT() + v.funAny() + v.funNullableT() + v.funNullableAny() } } @@ -324,16 +324,16 @@ fun case_21(map: MutableMap) { for ((k, v) in map) { if (k == null) continue if (v === null || false) break - k - k.equals(null) - k.propT - k.propAny - k.propNullableT - k.propNullableAny - k.funT() - k.funAny() - k.funNullableT() - k.funNullableAny() + k + k.equals(null) + k.propT + k.propAny + k.propNullableT + k.propNullableAny + k.funT() + k.funAny() + k.funNullableT() + k.funNullableAny() v v.equals(null) v.propT @@ -351,16 +351,16 @@ fun case_21(map: MutableMap) { fun case_22(x: T?) { while (true) { if (x === null) break - x - x.equals(null) - x.propT - x.propAny - x.propNullableT - x.propNullableAny - x.funT() - x.funAny() - x.funNullableT() - x.funNullableAny() + x + x.equals(null) + x.propT + x.propAny + x.propNullableT + x.propNullableAny + x.funT() + x.funAny() + x.funNullableT() + x.funNullableAny() } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt index 140151f3b48..e4d03b1f844 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt @@ -23,7 +23,7 @@ open class Case1 { x as L x as K if (x is T) { - x + x x.toByte() x.length x.get(0) @@ -50,9 +50,9 @@ inline fun case_2(x: Any?) { inline fun case_3(x: Any?) { x as T? if (x is T) { - x - x.length - x.get(0) + x + x.length + x.get(0) } } @@ -60,7 +60,7 @@ inline fun case_3(x: Any?) { inline fun case_4(x: Any?) { (x as? T)!! if (x is T?) { - x + x x.length x.get(0) } @@ -70,7 +70,7 @@ inline fun case_4(x: Any?) { inline fun case_5(x: Any?) { if (x as? T != null) { if (x is T?) { - x + x x.length x.get(0) } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt index 95d70314581..1cd06b01dc1 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt @@ -23,7 +23,7 @@ open class Case1 { x as L x as K if (x is T) { - x + x x.toByte() x.length x.get(0) @@ -50,9 +50,9 @@ inline fun case_2(x: Any?) { inline fun case_3(x: Any?) { x as T? if (x is T) { - x - x.length - x.get(0) + x + x.length + x.get(0) } } @@ -60,7 +60,7 @@ inline fun case_3(x: Any?) { inline fun case_4(x: Any?) { (x as? T)!! if (x is T?) { - x + x x.length x.get(0) } @@ -70,7 +70,7 @@ inline fun case_4(x: Any?) { inline fun case_5(x: Any?) { if (x as? T != null) { if (x is T?) { - x + x x.length x.get(0) } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt index 7182a272087..448a443fe9e 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt @@ -23,7 +23,7 @@ open class Case1 { x as L x as K if (x is T) { - x + x x.toByte() x.length x.get(0) @@ -50,9 +50,9 @@ inline fun case_2(x: Any?) { inline fun case_3(x: Any?) { x as T? if (x is T) { - x - x.length - x.get(0) + x + x.length + x.get(0) } } @@ -60,7 +60,7 @@ inline fun case_3(x: Any?) { inline fun case_4(x: Any?) { (x as? T)!! if (x is T?) { - x + x x.length x.get(0) } @@ -70,7 +70,7 @@ inline fun case_4(x: Any?) { inline fun case_5(x: Any?) { if (x as? T != null) { if (x is T?) { - x + x x.length x.get(0) } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt index d9e43beb530..ffb99d187e7 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt @@ -62,23 +62,23 @@ fun case_4(x: Class?) { // TESTCASE NUMBER: 5 fun case_5(x: T) { if (x?.propNullableT != null) { - x + x } } // TESTCASE NUMBER: 6 fun case_6(x: Inv?) { if (x?.prop_1?.prop_1?.prop_1?.prop_2 != null) { - x.prop_1.prop_1.prop_1.prop_2 - x.prop_1.prop_1.prop_1.prop_2.equals(10) + x.prop_1.prop_1.prop_1.prop_2 + x.prop_1.prop_1.prop_1.prop_2.equals(10) } } // TESTCASE NUMBER: 7 inline fun case_7(x: Inv?) { if (x?.prop_1?.prop_1?.prop_1?.prop_2 == null) else { - x.prop_1.prop_1.prop_1.prop_2 - x.prop_1.prop_1.prop_1.prop_2.equals(10) + x.prop_1.prop_1.prop_1.prop_2 + x.prop_1.prop_1.prop_1.prop_2.equals(10) } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt index fa556471b12..0d75ed3143f 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt @@ -133,7 +133,7 @@ fun case_8(x: Class) { // TESTCASE NUMBER: 9 fun case_9(x: T) { if (x!!.propNullableT != null) { - x + x x.propNullableT } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt index fb0c0039a37..a9ab1af9f94 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt @@ -104,23 +104,23 @@ fun case_6(x: Class?) { // TESTCASE NUMBER: 5 fun case_5(x: T) { if ((x as Any).propNullableT != null) { - x + x } } // TESTCASE NUMBER: 6 fun case_6(x: Inv?) { if (x?.prop_1?.prop_1?.prop_1?.prop_2 != null) { - x.prop_1.prop_1.prop_1.prop_2 - x.prop_1.prop_1.prop_1.prop_2.equals(10) + x.prop_1.prop_1.prop_1.prop_2 + x.prop_1.prop_1.prop_1.prop_2.equals(10) } } // TESTCASE NUMBER: 7 inline fun case_7(x: Inv?) { if (x?.prop_1?.prop_1?.prop_1?.prop_2 == null) else { - x.prop_1.prop_1.prop_1.prop_2 - x.prop_1.prop_1.prop_1.prop_2.equals(10) + x.prop_1.prop_1.prop_1.prop_2 + x.prop_1.prop_1.prop_1.prop_2.equals(10) } } @@ -138,4 +138,4 @@ inline fun case_9(x: Out?) { & Inv?")!>x.prop_1.prop_1.prop_1.prop_1 & Inv?")!>x.prop_1.prop_1.prop_1.prop_1.equals(10) } -} \ No newline at end of file +} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt index 37d2a387e67..33dd4a74a76 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt @@ -15,7 +15,7 @@ fun case_1(x: T?, y: K?) { x as T y as K - val z = x ?: y + val z = x ?: y x.equals(10) z @@ -26,6 +26,6 @@ fun case_1(x: T?, y: K?) { inline fun case_2(y: K?) { y as K - y + y y.equals(10) -} \ No newline at end of file +} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt index e3d4e60baa3..d34fd4501bb 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt @@ -74,7 +74,7 @@ fun ClassWithSixTypeParameters.case_5() { */ fun case_6(y: Inv) { if (y.prop_3 is MutableList<*>) { - ")!>y.prop_3 + ")!>y.prop_3 "), DEBUG_INFO_SMARTCAST!>y.prop_3[0] } } @@ -85,9 +85,9 @@ fun case_6(y: Inv) { */ fun Inv.case_7() { if (this.prop_3 is MutableList<*>) { - ")!>this.prop_3 + ")!>this.prop_3 "), DEBUG_INFO_SMARTCAST!>this.prop_3[0] - ")!>prop_3 + ")!>prop_3 "), DEBUG_INFO_SMARTCAST!>prop_3[0] } } @@ -107,7 +107,7 @@ fun T.case_8() { */ fun T.case_9() { if (this is String) { - this + this this.length length }