Change default upper bound of Java type parameters to Any!

#KT-7672 Fixed

compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt

@@ -59,7 +59,7 @@ internal final class Foo1 : java.util.ArrayList<kotlin.Int> {
     public open override /*1*/ /*fake_override*/ fun size(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit

compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.txt

@@ -2,8 +2,8 @@ package
 
 package p {
 
-    public open class Base</*0*/ T> {
-        public constructor Base</*0*/ T>()
+    public open class Base</*0*/ T : kotlin.Any!> {
+        public constructor Base</*0*/ T : kotlin.Any!>()
         public/*package*/ open fun coll(/*0*/ r: kotlin.(Mutable)Collection<*>!): 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

compiler/testData/diagnostics/tests/generics/starProjections/inheritedFromJava.txt

@@ -2,8 +2,8 @@ package
 
 package p {
 
-    public open class Base</*0*/ T> {
-        public constructor Base</*0*/ T>()
+    public open class Base</*0*/ T : kotlin.Any!> {
+        public constructor Base</*0*/ T : kotlin.Any!>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public/*package*/ open fun foo(/*0*/ r: p.R<*>!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.txt

@@ -10,6 +10,6 @@ public open class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public open fun </*0*/ T> bar(/*0*/ clazz: java.lang.Class<T!>!): java.lang.Class<java.lang.Class<T!>!>!
-    public open fun </*0*/ T> foo(/*0*/ clazz: java.lang.Class<T!>!): java.lang.Class<T!>!
+    public open fun </*0*/ T : kotlin.Any!> bar(/*0*/ clazz: java.lang.Class<T!>!): java.lang.Class<java.lang.Class<T!>!>!
+    public open fun </*0*/ T : kotlin.Any!> foo(/*0*/ clazz: java.lang.Class<T!>!): java.lang.Class<T!>!
 }

compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt

@@ -41,7 +41,7 @@ internal abstract class AL : java.util.ArrayList<p.P> {
     public open override /*1*/ /*fake_override*/ fun size(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<p.P>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
@@ -64,23 +64,23 @@ package p {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    public open class B</*0*/ TB> : p.A<TB!> {
-        public constructor B</*0*/ TB>()
+    public open class B</*0*/ TB : kotlin.Any!> : p.A<TB!> {
+        public constructor B</*0*/ TB : kotlin.Any!>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public/*package*/ open override /*1*/ fun foo(/*0*/ p: p.A<TB!>): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    public open class C</*0*/ TC> : p.B<TC!>, p.A<TC!> {
-        public constructor C</*0*/ TC>()
+    public open class C</*0*/ TC : kotlin.Any!> : p.B<TC!>, p.A<TC!> {
+        public constructor C</*0*/ TC : kotlin.Any!>()
         public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*2*/ /*fake_override*/ fun foo(/*0*/ p: p.A<TC!>): kotlin.Unit
         public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    public interface G</*0*/ TG> {
+    public interface G</*0*/ TG : 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 override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.txt

@@ -3,7 +3,7 @@ package
 internal abstract class K : p.C {
     public constructor K()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun </*0*/ TB> foo(/*0*/ p: TB!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun </*0*/ TB : kotlin.Any!> foo(/*0*/ p: TB!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt

@@ -9,8 +9,8 @@ public open class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public open class X</*0*/ T> {
-    public constructor X</*0*/ T>()
+public open class X</*0*/ T : kotlin.Any!> {
+    public constructor X</*0*/ T : kotlin.Any!>()
     public/*package*/ open fun barN(/*0*/ org.jetbrains.annotations.NotNull() a: T): 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

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt

@@ -9,8 +9,8 @@ public open class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public open class X</*0*/ T> {
-    public constructor X</*0*/ T>()
+public open class X</*0*/ T : kotlin.Any!> {
+    public constructor X</*0*/ T : kotlin.Any!>()
     public/*package*/ open fun barN(/*0*/ org.jetbrains.annotations.NotNull() a: T): 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

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.txt

@@ -9,8 +9,8 @@ public open class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public open class X</*0*/ T> {
-    public constructor X</*0*/ T>()
+public open class X</*0*/ T : kotlin.Any!> {
+    public constructor X</*0*/ T : kotlin.Any!>()
     public/*package*/ open fun bar(/*0*/ a: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public/*package*/ open fun foo(): T!

compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.txt

@@ -9,8 +9,8 @@ public open class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public open class X</*0*/ T> {
-    public constructor X</*0*/ T>()
+public open class X</*0*/ T : kotlin.Any!> {
+    public constructor X</*0*/ T : kotlin.Any!>()
     public/*package*/ open fun bar(/*0*/ a: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public/*package*/ open fun foo(): T!

compiler/testData/diagnostics/tests/j+k/UnboxingNulls.txt

@@ -3,8 +3,8 @@ package
 package a {
     internal fun foo(): kotlin.Unit
 
-    public open class Test</*0*/ T> {
-        public constructor Test</*0*/ T>()
+    public open class Test</*0*/ T : kotlin.Any!> {
+        public constructor Test</*0*/ T : 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/*package*/ open fun t(): T!

compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt

@@ -1,11 +1,11 @@
 package
 
-public /*synthesized*/ fun </*0*/ K, /*1*/ V> ConcMap(/*0*/ function: (K!, MyFunc<in K!, out V!>!) -> V!): ConcMap<K, V>
-public /*synthesized*/ fun </*0*/ K, /*1*/ V> MyFunc(/*0*/ function: (K!) -> V!): MyFunc<K, V>
+public /*synthesized*/ fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> ConcMap(/*0*/ function: (K!, MyFunc<in K!, out V!>!) -> V!): ConcMap<K, V>
+public /*synthesized*/ fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> MyFunc(/*0*/ function: (K!) -> V!): MyFunc<K, V>
 public fun concurrentMap(): kotlin.Unit
 
-public open class ConcHashMap</*0*/ K, /*1*/ V> : ConcMap<K!, V!> {
-    public constructor ConcHashMap</*0*/ K, /*1*/ V>()
+public open class ConcHashMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : ConcMap<K!, V!> {
+    public constructor ConcHashMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     java.lang.Override() public/*package*/ final override /*1*/ /*synthesized*/ fun computeIfAbsent(/*0*/ key: K!, /*1*/ mappingFunction: ((K!) -> V!)!): V!
     java.lang.Override() public/*package*/ open override /*1*/ fun computeIfAbsent(/*0*/ key: K!, /*1*/ mappingFunction: MyFunc<in K!, out V!>!): V!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -13,7 +13,7 @@ public open class ConcHashMap</*0*/ K, /*1*/ V> : ConcMap<K!, V!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface ConcMap</*0*/ K, /*1*/ V> {
+public interface ConcMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> {
     public final /*synthesized*/ fun computeIfAbsent(/*0*/ key: K!, /*1*/ mappingFunction: ((K!) -> V!)!): V!
     public abstract fun computeIfAbsent(/*0*/ key: K!, /*1*/ mappingFunction: MyFunc<in K!, out V!>!): V!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -21,7 +21,7 @@ public interface ConcMap</*0*/ K, /*1*/ V> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface MyFunc</*0*/ K, /*1*/ V> {
+public interface MyFunc</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> {
     public abstract fun apply(/*0*/ String: K!): V!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt

@@ -1,10 +1,10 @@
 package
 
-public /*synthesized*/ fun </*0*/ K> A(/*0*/ function: (K!, MyFunc!) -> K!): A<K>
+public /*synthesized*/ fun </*0*/ K : kotlin.Any!> A(/*0*/ function: (K!, MyFunc!) -> K!): A<K>
 public /*synthesized*/ fun MyFunc(/*0*/ function: (kotlin.String!) -> kotlin.String!): MyFunc
 internal fun main(): kotlin.Unit
 
-public interface A</*0*/ K> {
+public interface A</*0*/ K : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final /*synthesized*/ fun foo(/*0*/ key: K!, /*1*/ f: ((kotlin.String!) -> kotlin.String!)!): K!
     public abstract fun foo(/*0*/ key: K!, /*1*/ f: MyFunc!): K!
@@ -12,8 +12,8 @@ public interface A</*0*/ K> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public open class B</*0*/ E> : A<E!> {
-    public constructor B</*0*/ E>()
+public open class B</*0*/ E : kotlin.Any!> : A<E!> {
+    public constructor B</*0*/ E : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     java.lang.Override() public final override /*1*/ /*synthesized*/ fun foo(/*0*/ key: E!, /*1*/ f: ((kotlin.String!) -> kotlin.String!)!): E!
     java.lang.Override() public open override /*1*/ fun foo(/*0*/ key: E!, /*1*/ f: MyFunc!): E!

compiler/testData/diagnostics/tests/j+k/types/arrayList.txt

@@ -1,7 +1,7 @@
 package
 
-public/*package*/ open class J</*0*/ T> : ML<T!> {
-    public/*package*/ constructor J</*0*/ T>()
+public/*package*/ open class J</*0*/ T : kotlin.Any!> : ML<T!> {
+    public/*package*/ constructor J</*0*/ T : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/j+k/types/typeParameter.txt

@@ -2,7 +2,7 @@ package
 
 public/*package*/ interface J : K {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ t: T): kotlin.Unit
+    public abstract override /*1*/ fun </*0*/ T : kotlin.Any!> foo(/*0*/ t: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt

@@ -2,8 +2,8 @@ package
 
 internal fun </*0*/ M2 : WithFoo> foo(/*0*/ delegateResolver: ResolverForProject<M2?>): ResolverForProject<M2?>
 
-public/*package*/ open class MyMap</*0*/ K, /*1*/ V> : java.util.AbstractMap<K!, V!> {
-    public/*package*/ constructor MyMap</*0*/ K, /*1*/ V>()
+public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractMap<K!, V!> {
+    public/*package*/ constructor MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.(Mutable)Set<K!>!
     invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.(Mutable)Collection<V!>!
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit

compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt

@@ -0,0 +1,25 @@
+// FILE: Derived.java
+import kotlin.jvm.functions.Function0;
+import org.jetbrains.annotations.NotNull;
+
+public class Derived implements Base {
+    @Override
+    public <V> void foo() {}
+}
+
+// FILE: main.kt
+interface Base {
+    fun <V: Any> foo()
+}
+
+class KotlinDerived1 : Derived() {
+    override fun <V: Any?> foo() {}
+}
+
+class KotlinDerived2 : Derived() {
+    override fun <V: Any> foo() {}
+}
+
+fun main(args: Array<String>) {
+    Derived().foo<String>()
+}

compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt

@@ -0,0 +1,34 @@
+package
+
+internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+
+internal interface Base {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    internal abstract fun </*0*/ V : kotlin.Any> foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class Derived : Base {
+    public constructor Derived()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    java.lang.Override() public open override /*1*/ fun </*0*/ V : kotlin.Any!> foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+internal final class KotlinDerived1 : Derived {
+    public constructor KotlinDerived1()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ fun </*0*/ V> foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+internal final class KotlinDerived2 : Derived {
+    public constructor KotlinDerived2()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ fun </*0*/ V : kotlin.Any> foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/methodWithTypeParameter.txt

@@ -8,36 +8,36 @@ public/*package*/ open class Outer {
 
     public/*package*/ open inner class A {
         public/*package*/ constructor A()
-        public/*package*/ open fun </*0*/ T> bar(/*0*/ x: Y<T!>!): X<T!>!
+        public/*package*/ open fun </*0*/ T : kotlin.Any!> bar(/*0*/ x: Y<T!>!): X<T!>!
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public/*package*/ open fun </*0*/ K, /*1*/ V> foo(/*0*/ x: K!): V!
+        public/*package*/ open fun </*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> foo(/*0*/ x: K!): V!
         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 B : Outer.A {
         public/*package*/ constructor B()
-        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ R> bar(/*0*/ org.jetbrains.annotations.NotNull() x: Y<R>): X<R!>?
+        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ R : kotlin.Any!> bar(/*0*/ org.jetbrains.annotations.NotNull() x: Y<R>): X<R!>?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ T1, /*1*/ T2> foo(/*0*/ org.jetbrains.annotations.Nullable() x: T1?): T2
+        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ T1 : kotlin.Any!, /*1*/ T2 : kotlin.Any!> foo(/*0*/ org.jetbrains.annotations.Nullable() x: T1?): T2
         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 </*0*/ E> bar(/*0*/ x: Y<E>): X<E!>?
+        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ E : kotlin.Any!> bar(/*0*/ x: Y<E>): X<E!>?
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ I, /*1*/ J> foo(/*0*/ x: I?): J
+        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ I : kotlin.Any!, /*1*/ J : kotlin.Any!> foo(/*0*/ x: I?): J
         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 D : Outer.C {
         public/*package*/ constructor D()
-        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ F> bar(/*0*/ org.jetbrains.annotations.Nullable() x: Y<F!>!): X<F!>
+        java.lang.Override() public/*package*/ open override /*1*/ fun </*0*/ F : kotlin.Any!> bar(/*0*/ org.jetbrains.annotations.Nullable() x: Y<F!>!): X<F!>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        java.lang.Override() org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ fun </*0*/ U, /*1*/ W> foo(/*0*/ org.jetbrains.annotations.Nullable() x: U?): W
+        java.lang.Override() org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ fun </*0*/ U : kotlin.Any!, /*1*/ W : kotlin.Any!> foo(/*0*/ org.jetbrains.annotations.Nullable() x: U?): W
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }

compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt

@@ -1,11 +1,11 @@
 package
 
-public/*package*/ /*synthesized*/ fun </*0*/ T> A(/*0*/ function: (T!, T!) -> kotlin.Unit): A<T>
+public/*package*/ /*synthesized*/ fun </*0*/ T : kotlin.Any!> A(/*0*/ function: (T!, T!) -> kotlin.Unit): A<T>
 public/*package*/ /*synthesized*/ fun B1(/*0*/ function: (kotlin.String!, kotlin.String?) -> kotlin.Unit): B1
 public/*package*/ /*synthesized*/ fun B2(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Unit): B2
 public/*package*/ /*synthesized*/ fun B3(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Unit): B3
 
-public/*package*/ interface A</*0*/ T> {
+public/*package*/ interface A</*0*/ T : kotlin.Any!> {
     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 open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/scopes/visibility2.txt

@@ -72,7 +72,7 @@ package b {
         public open override /*1*/ /*fake_override*/ fun size(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<java.lang.Integer>
         public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-        public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+        public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
         public open override /*1*/ fun toString(): kotlin.String
         public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit

compiler/testData/diagnostics/tests/subtyping/kt-1457.txt

@@ -43,7 +43,7 @@ internal final class MyListOfPairs</*0*/ T> : java.util.ArrayList<Pair<T, T>> {
     public open override /*1*/ /*fake_override*/ fun size(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<Pair<T, T>>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit

compiler/testData/diagnostics/tests/syntheticExtensions/FalseGetters.txt

@@ -6,7 +6,7 @@ public open class JavaClass {
     public constructor JavaClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun getSomething1(/*0*/ p: kotlin.Int): kotlin.Int
-    public open fun </*0*/ T> getSomething2(): T!
+    public open fun </*0*/ T : kotlin.Any!> getSomething2(): T!
     public open fun getSomethingVoid(): kotlin.Unit
     public open fun getter(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/syntheticExtensions/FalseSetters.txt

@@ -15,7 +15,7 @@ public open class JavaClass {
     public open fun setSomething1(/*0*/ value: kotlin.Int, /*1*/ c: kotlin.Char): kotlin.Unit
     public open fun setSomething2(/*0*/ value: kotlin.String!): kotlin.Unit
     public open fun setSomething3(/*0*/ value: kotlin.Int): kotlin.Int
-    public open fun </*0*/ T> setSomething4(/*0*/ value: kotlin.Int): kotlin.Unit
+    public open fun </*0*/ T : kotlin.Any!> setSomething4(/*0*/ value: kotlin.Int): kotlin.Unit
     public open fun setSomething6(/*0*/ vararg value: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 

compiler/testData/diagnostics/tests/syntheticExtensions/GenericClass.txt

@@ -2,8 +2,8 @@ package
 
 internal fun foo(/*0*/ javaClass: JavaClass<kotlin.String>): kotlin.Unit
 
-public open class JavaClass</*0*/ T> {
-    public constructor JavaClass</*0*/ T>()
+public open class JavaClass</*0*/ T : kotlin.Any!> {
+    public constructor JavaClass</*0*/ T : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun getSomething(): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt

@@ -0,0 +1,17 @@
+// FILE: Derived.java
+import kotlin.jvm.functions.Function0;
+import org.jetbrains.annotations.NotNull;
+
+public class Derived implements Base {
+    @Override
+    public <V> void foo(@NotNull Function0<? extends V> compute) {}
+}
+
+// FILE: main.kt
+interface Base {
+    fun <V: Any> foo(compute: () -> V?)
+}
+
+fun main(args: Array<String>) {
+    Derived().foo<String> { "" }
+}

compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt

@@ -0,0 +1,18 @@
+package
+
+internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+
+internal interface Base {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    internal abstract fun </*0*/ V : kotlin.Any> foo(/*0*/ compute: () -> V?): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class Derived : Base {
+    public constructor Derived()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    java.lang.Override() public open override /*1*/ fun </*0*/ V : kotlin.Any!> foo(/*0*/ org.jetbrains.annotations.NotNull() compute: () -> V?): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt

@@ -3,8 +3,8 @@ package
 internal fun bar(): kotlin.String?
 internal fun foo(): kotlin.Unit
 
-kotlin.jvm.PurelyImplements(value = "kotlin.MutableCollection") public/*package*/ open class A</*0*/ T> : java.util.AbstractCollection<T!>, kotlin.MutableCollection<T> {
-    public/*package*/ constructor A</*0*/ T>()
+kotlin.jvm.PurelyImplements(value = "kotlin.MutableCollection") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractCollection<T!>, kotlin.MutableCollection<T> {
+    public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
@@ -19,6 +19,6 @@ kotlin.jvm.PurelyImplements(value = "kotlin.MutableCollection") public/*package*
     public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
     java.lang.Override() public open override /*2*/ fun size(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt

@@ -3,8 +3,8 @@ package
 internal fun bar(): kotlin.String?
 internal fun foo(): kotlin.Unit
 
-kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A</*0*/ T> : java.util.AbstractList<T!>, kotlin.MutableList<T> {
-    public/*package*/ constructor A</*0*/ T>()
+kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!>, kotlin.MutableList<T> {
+    public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T): kotlin.Unit
@@ -33,6 +33,6 @@ kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open
     java.lang.Override() public open override /*2*/ fun size(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt

@@ -3,8 +3,8 @@ package
 internal fun bar(): kotlin.String?
 internal fun foo(): kotlin.Unit
 
-kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A</*0*/ T, /*1*/ V> : java.util.AbstractList<T!> {
-    public/*package*/ constructor A</*0*/ T, /*1*/ V>()
+kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractList<T!> {
+    public/*package*/ constructor A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
@@ -33,6 +33,6 @@ kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open
     java.lang.Override() public open override /*1*/ fun size(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }