Don't load Object as a supertype for Java classes

#KT-4890 In Progress
 #KT-5002 Fixed

compiler/testData/codegen/box/classes/kt2288.kt

@@ -1,6 +1,6 @@
 public open class Test(): java.util.RandomAccess, Cloneable, java.io.Serializable
 {
-        public override fun clone(): Test = Test() // Override 'clone()' with more precise type 'Test'
+        public fun clone(): Test = Test() // Override 'clone()' with more precise type 'Test'
 
         public override fun toString() = "OK"
 }

compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt

@@ -1,7 +1,7 @@
 fun box(): String {
     val f = { }
-    val class1 = Runnable(f).getClass()
-    val class2 = Runnable(f).getClass()
+    val class1 = (Runnable(f) as Object).getClass()
+    val class2 = (Runnable(f) as Object).getClass()
 
     return if (class1 == class2) "OK" else "$class1 $class2"
-}
+}

compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt

@@ -1,7 +1,7 @@
 fun box(): String {
     val f = { }
-    val class1 = Runnable(f).getClass()
-    val class2 = Custom.Runnable(f).getClass()
+    val class1 = Runnable(f).javaClass
+    val class2 = Custom.Runnable(f).javaClass
 
     return if (class1 != class2) "OK" else "Same class: $class1"
 }

compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt

@@ -2,7 +2,7 @@ import java.util.Arrays
 
 fun box(): String {
     val r: JavaClass.Computable<String> = JavaClass.Computable { "OK" }
-    val supertypes = Arrays.toString(r.getClass().getGenericInterfaces())
+    val supertypes = Arrays.toString(r.javaClass.getGenericInterfaces())
     if (supertypes != "[JavaClass.JavaClass\$Computable<java.lang.String>]") return "Fail: $supertypes"
     return JavaClass.compute(r)!!
 }

compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/box.kt

@@ -1,6 +1,6 @@
 fun box(): String {
-    val class1 = getWrapped1().getClass()
-    val class2 = getWrapped2().getClass()
+    val class1 = getWrapped1().javaClass
+    val class2 = getWrapped2().javaClass
 
     return if (class1 != class2) "OK" else "Same class: $class1"
-}
+}

compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt

@@ -0,0 +1,15 @@
+import java.io.Serializable
+
+public data class Pair<out A, out B> (
+        public val first: A,
+        public val second: B
+) : Serializable
+
+fun box(): String {
+    val p = Pair(42, "OK")
+    val q = Pair(42, "OK")
+    if (p != q) return "Fail equals"
+    if (p.hashCode() != q.hashCode()) return "Fail hashCode"
+    if (p.toString() != q.toString()) return "Fail toString"
+    return p.second
+}

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

@@ -15,7 +15,6 @@ public class Y extends X<A> {
 // FILE: test.kt
 
 fun main() {
-    Y().foo()<!UNSAFE_CALL!>.<!>wait()
+    Y().foo()<!UNSAFE_CALL!>.<!>hashCode()
     Y().bar(null)
 }
-

compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt

@@ -1,16 +1,8 @@
 package test
 
-public final class ClassWithObjectMethod : java.lang.Object {
+public final class ClassWithObjectMethod {
     public constructor ClassWithObjectMethod()
-    protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun finalize(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class<out kotlin.Any?>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun notify(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun notifyAll(): kotlin.Unit
     public open override /*1*/ fun toString(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun wait(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long, /*1*/ p1: kotlin.Int): kotlin.Unit
 }

compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt

@@ -1,15 +1,9 @@
 package test
 
-public trait InterfaceWithObjectMethods : java.lang.Object {
-    public abstract override /*1*/ fun clone(): kotlin.Any
+public trait InterfaceWithObjectMethods {
+    public abstract fun clone(): kotlin.Any?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ fun finalize(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun getClass(): java.lang.Class<out kotlin.Any?>
+    public abstract fun finalize(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun notify(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun notifyAll(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun wait(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun wait(/*0*/ p0: kotlin.Long, /*1*/ p1: kotlin.Int): kotlin.Unit
 }

compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt

@@ -8,7 +8,7 @@ public final class Sub : test.Super {
     public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
 }
 
-public open class Super : java.lang.Object {
+public open class Super {
     public constructor Super()
     public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
     public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit

compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt

@@ -6,7 +6,7 @@ public final class Sub : test.Super {
     public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
 }
 
-public open class Super : java.lang.Object {
+public open class Super {
     public constructor Super()
     public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
     public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit

compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt

@@ -6,7 +6,7 @@ public final class Sub : test.Super {
     public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
 }
 
-public open class Super : java.lang.Object {
+public open class Super {
     public constructor Super()
     public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
     public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit

compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class Base : java.lang.Object {
+public open class Base {
     public constructor Base()
     public/*package*/ open fun foo(): kotlin.Unit
 }

compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class Base : java.lang.Object {
+public open class Base {
     public constructor Base()
     protected/*protected and package*/ open fun foo(): kotlin.Unit
 }

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.txt

@@ -7,7 +7,7 @@ public final class InheritJavaField : test.Super {
     public open override /*1*/ /*fake_override*/ fun method(): kotlin.Int
 }
 
-public open class Super : java.lang.Object {
+public open class Super {
     public constructor Super()
     public final var field: kotlin.Int
     private final var privateField: kotlin.Int

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.txt

@@ -2,7 +2,7 @@ package test
 
 public /*synthesized*/ fun A(/*0*/ function: (kotlin.Int) -> kotlin.Unit): test.A
 
-public trait A : java.lang.Object {
+public trait A {
     public abstract fun foo(/*0*/ p0: kotlin.Int): kotlin.Unit
 }
 

compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/javaRefersToKotlin.txt

@@ -2,7 +2,7 @@ package test
 
 public /*synthesized*/ fun J(/*0*/ function: (test.K?) -> kotlin.Unit): test.J
 
-public trait J : java.lang.Object {
+public trait J {
     public abstract fun foo(/*0*/ p0: test.K?): kotlin.Unit
 }
 

compiler/testData/loadJava/sourceJava/ErrorTypes.txt

@@ -1,14 +1,14 @@
 package test
 
-public trait ErrorTypes : java.lang.Object {
-    
+public trait ErrorTypes {
+
     public trait Sub : test.ErrorTypes.Super {
         public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
         public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]?
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
         public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]?
     }

compiler/testData/loadJava/sourceJava/NullInAnnotation.txt

@@ -2,9 +2,9 @@ package test
 
 public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> kotlin.Unit): test.NullInAnnotation
 
-public trait NullInAnnotation : java.lang.Object {
+public trait NullInAnnotation {
     test.NullInAnnotation.Ann(a = null: kotlin.Nothing?, b = {null}: kotlin.Array<kotlin.String>) public abstract fun foo(): kotlin.Unit
-    
+
     public final annotation class Ann : kotlin.Annotation {
         public constructor Ann(/*0*/ a: kotlin.String, /*1*/ vararg b: kotlin.String /*kotlin.Array<kotlin.String>*/)
         public abstract fun a(): kotlin.String

compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.txt

@@ -1,20 +1,20 @@
 package test
 
-public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
-    
+public trait ReturnInnerSubclassOfSupersInner {
+
     public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B> {
         public constructor Sub</*0*/ B>()
-        
+
         public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
             public/*package*/ constructor Inner()
             public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B>?
         }
     }
-    
-    public open class Super</*0*/ A> : java.lang.Object {
+
+    public open class Super</*0*/ A> {
         public constructor Super</*0*/ A>()
-        
-        public/*package*/ open inner class Inner : java.lang.Object {
+
+        public/*package*/ open inner class Inner {
             public/*package*/ constructor Inner()
             public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
         }

compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt

@@ -1,7 +1,7 @@
 package test
 
-public trait ReturnNotSubtype : java.lang.Object {
-    
+public trait ReturnNotSubtype {
+
     public trait Sub : test.ReturnNotSubtype.Super<kotlin.Boolean> {
         public abstract override /*1*/ fun _void(): kotlin.Boolean
         public abstract override /*1*/ fun array(): kotlin.Array<java.lang.Void>?
@@ -10,8 +10,8 @@ public trait ReturnNotSubtype : java.lang.Object {
         public abstract override /*1*/ fun string2(): kotlin.MutableList<kotlin.Boolean>?
         public abstract override /*1*/ fun t(): java.lang.Void?
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun _void(): kotlin.Unit
         public abstract fun array(): kotlin.Array<T>?
         public abstract fun klass(): java.lang.Class<out kotlin.CharSequence?>?

compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt

@@ -1,17 +1,17 @@
 package test
 
-public trait WrongNumberOfGenericParameters : java.lang.Object {
+public trait WrongNumberOfGenericParameters {
     public abstract fun o0(): test.WrongNumberOfGenericParameters.One<out kotlin.Any?>?
     public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>?
     public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<out kotlin.Any?, out kotlin.Any?>?
     public abstract fun z(): test.WrongNumberOfGenericParameters.Zero?
-    
-    public trait One</*0*/ T> : java.lang.Object {
+
+    public trait One</*0*/ T> {
     }
-    
-    public trait Two</*0*/ P, /*1*/ Q> : java.lang.Object {
+
+    public trait Two</*0*/ P, /*1*/ Q> {
     }
-    
-    public trait Zero : java.lang.Object {
+
+    public trait Zero {
     }
 }

compiler/testData/repl/imports.repl

@@ -2,5 +2,5 @@
 null
 >>> val s = ByteArrayOutputStream()
 null
->>> s.getClass()!!.getName()
+>>> s.javaClass!!.getName()
 java.io.ByteArrayOutputStream