Remove Object from supertypes in LoadJava testData

compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt

@@ -1,9 +1,9 @@
 package test
 
-public open class InnerOfGeneric : java.lang.Object {
+public open class InnerOfGeneric {
     public constructor InnerOfGeneric()
 
-    public abstract inner class A</*0*/ K> : java.lang.Object {
+    public abstract inner class A</*0*/ K> {
         public constructor A</*0*/ K>()
 
         public abstract inner class Inner : test.InnerOfGeneric.S<K> {
@@ -21,7 +21,7 @@ public open class InnerOfGeneric : java.lang.Object {
         }
     }
 
-    public trait S</*0*/ E> : java.lang.Object {
+    public trait S</*0*/ E> {
         public abstract fun iterator(): kotlin.MutableIterator<E>?
     }
 }

compiler/testData/loadJava/compiledJava/OverrideMethod.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class OverrideMethod : java.lang.Object {
+public open class OverrideMethod {
     public constructor OverrideMethod()
 
     public/*package*/ open inner class Base : test.OverrideMethod.SuperBase {
@@ -18,7 +18,7 @@ public open class OverrideMethod : java.lang.Object {
         public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
     }
 
-    public/*package*/ open inner class SuperBase : java.lang.Object {
+    public/*package*/ open inner class SuperBase {
         public/*package*/ constructor SuperBase()
         public/*package*/ open fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/PrivateMembers.txt

@@ -1,21 +1,21 @@
 package test
 
-public open class PrivateMembers : java.lang.Object {
+public open class PrivateMembers {
     private constructor PrivateMembers()
     private final var field: kotlin.Int
     private open fun method(): kotlin.Unit
     private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface?): kotlin.Unit
 
-    private open inner class Inner : java.lang.Object {
+    private open inner class Inner {
         private constructor Inner()
     }
 
-    private open class Nested : java.lang.Object {
+    private open class Nested {
         private constructor Nested()
     }
 
-    private trait SamInterface : java.lang.Object {
+    private trait SamInterface {
         public abstract fun foo(): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class PrivateMembersInHierarchy : java.lang.Object {
+public open class PrivateMembersInHierarchy {
     public constructor PrivateMembersInHierarchy()
 
     public open class Sub : test.PrivateMembersInHierarchy.Super {
@@ -10,7 +10,7 @@ public open class PrivateMembersInHierarchy : java.lang.Object {
         private open fun method(): kotlin.Unit
     }
 
-    public open class Super : java.lang.Object {
+    public open class Super {
         public constructor Super()
         private final var field: kotlin.Int
         private final var field2: kotlin.Int

compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt

@@ -1,12 +1,12 @@
 package test
 
-public trait RawTypeWithUpperBound : java.lang.Object {
+public trait RawTypeWithUpperBound {
 
-    public trait Bar : java.lang.Object {
+    public trait Bar {
         public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence?>?): kotlin.Unit
     }
 
-    public trait Foo</*0*/ T : kotlin.CharSequence?> : java.lang.Object {
+    public trait Foo</*0*/ T : kotlin.CharSequence?> {
     }
 }
 

compiler/testData/loadJava/compiledJava/RawUpperBound.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>?> : java.lang.Object {
+public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>?> {
 }

compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>?> : java.lang.Object {
+public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>?> {
 }

compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>?> : java.lang.Object {
+public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>?> {
 }

compiler/testData/loadJava/compiledJava/SubclassFromNested.txt

@@ -1,9 +1,9 @@
 package test
 
-public/*package*/ open class B : java.lang.Object {
+public/*package*/ open class B {
     public/*package*/ constructor B(/*0*/ p0: test.B.C?)
 
-    public/*package*/ trait C : java.lang.Object {
+    public/*package*/ trait C {
     }
 }
 

compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt

@@ -1,16 +1,16 @@
 package test
 
-public trait AnnotationInParam : java.lang.Object {
+public trait AnnotationInParam {
 
-    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A {
         public constructor A()
     }
 
-    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B {
         public constructor B()
     }
 
-    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C {
         public constructor C()
     }
 

compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class ArithmeticExpressionInParam : java.lang.Object {
+public open class ArithmeticExpressionInParam {
     public constructor ArithmeticExpressionInParam()
 
     public final annotation class Anno : kotlin.Annotation {
@@ -8,7 +8,7 @@ public open class ArithmeticExpressionInParam : java.lang.Object {
         public abstract fun value(): kotlin.Int
     }
 
-    test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class : java.lang.Object {
+    test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class {
         public constructor Class()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait ArrayOfEnumInParam : java.lang.Object {
+public trait ArrayOfEnumInParam {
 
     java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array<java.lang.annotation.ElementType>) public final annotation class targetAnnotation : kotlin.Annotation {
         public constructor targetAnnotation(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt

@@ -1,8 +1,8 @@
 package test
 
-public trait ArrayOfStringInParam : java.lang.Object {
+public trait ArrayOfStringInParam {
 
-    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<kotlin.String>) public open class A : java.lang.Object {
+    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<kotlin.String>) public open class A {
         public constructor A()
     }
 

compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class ClassObjectArrayInParam : java.lang.Object {
+public open class ClassObjectArrayInParam {
     public constructor ClassObjectArrayInParam()
 
     public final annotation class Anno : kotlin.Annotation {
@@ -8,7 +8,7 @@ public open class ClassObjectArrayInParam : java.lang.Object {
         public abstract fun value(): kotlin.Array<java.lang.Class<out kotlin.Any?>>
     }
 
-    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested : java.lang.Object {
+    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested {
         public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class ClassObjectInParam : java.lang.Object {
+public open class ClassObjectInParam {
     public constructor ClassObjectInParam()
 
     public final annotation class Anno : kotlin.Annotation {
@@ -8,7 +8,7 @@ public open class ClassObjectInParam : java.lang.Object {
         public abstract fun value(): java.lang.Class<out kotlin.Any?>
     }
 
-    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested : java.lang.Object {
+    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {
         public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait CustomAnnotation : java.lang.Object {
+public trait CustomAnnotation {
 
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)
@@ -31,7 +31,7 @@ public trait CustomAnnotation : java.lang.Object {
         }
     }
 
-    test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest : java.lang.Object {
+    test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {
         public constructor MyTest()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait CustomAnnotationWithDefaultParameter : java.lang.Object {
+public trait CustomAnnotationWithDefaultParameter {
 
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...)
@@ -8,7 +8,7 @@ public trait CustomAnnotationWithDefaultParameter : java.lang.Object {
         public abstract fun second(): kotlin.String
     }
 
-    test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest : java.lang.Object {
+    test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest {
         public constructor MyTest()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt

@@ -1,8 +1,8 @@
 package test
 
-public trait EmptyArrayInParam : java.lang.Object {
+public trait EmptyArrayInParam {
 
-    test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<kotlin.String>) public open class A : java.lang.Object {
+    test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<kotlin.String>) public open class A {
         public constructor A()
     }
 

compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait EnumInParam : java.lang.Object {
+public trait EnumInParam {
 
     java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation {
         public constructor RetentionAnnotation(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt

@@ -1,8 +1,8 @@
 package test
 
-public trait PrimitiveValueInParam : java.lang.Object {
+public trait PrimitiveValueInParam {
 
-    test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
+    test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A {
         public constructor A()
     }
 

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait RecursiveAnnotation : java.lang.Object {
+public trait RecursiveAnnotation {
 
     test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: kotlin.String)

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait RecursiveAnnotation2 : java.lang.Object {
+public trait RecursiveAnnotation2 {
 
     public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)

compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait StringConcatenationInParam : java.lang.Object {
+public trait StringConcatenationInParam {
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
 
-    test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
+    test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait StringConstantInParam : java.lang.Object {
+public trait StringConstantInParam {
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
 
-    test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
+    test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait StringInParam : java.lang.Object {
+public trait StringInParam {
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
 
-    test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
+    test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
 }

compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt

@@ -1,9 +1,9 @@
 package test
 
-public open class ProtectedPackageConstructor : java.lang.Object {
+public open class ProtectedPackageConstructor {
     public constructor ProtectedPackageConstructor()
 
-    protected/*protected static*/ open class Foo : java.lang.Object {
+    protected/*protected static*/ open class Foo {
         protected/*protected and package*/ constructor Foo()
     }
 }

compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt

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

compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class ProtectedPackageProperty : java.lang.Object {
+public open class ProtectedPackageProperty {
     public constructor ProtectedPackageProperty()
     protected/*protected and package*/ final var foo: kotlin.Int
 }

compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt

@@ -1,9 +1,9 @@
 package test
 
-public open class ConstructorInProtectedStaticNestedClass : java.lang.Object {
+public open class ConstructorInProtectedStaticNestedClass {
     public constructor ConstructorInProtectedStaticNestedClass()
 
-    protected/*protected static*/ open class Inner : java.lang.Object {
+    protected/*protected static*/ open class Inner {
         protected/*protected and package*/ constructor Inner()
     }
 }

compiler/testData/loadJava/compiledJava/sam/Comparator.txt

@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T?, T?) -> kotlin.Int): test.Comparator<T>
 
-public trait Comparator</*0*/ T> : java.lang.Object {
+public trait Comparator</*0*/ T> {
     public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): kotlin.Int
 }

compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt

@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, kotlin.String?) -> kotlin.Boolean): test.FilenameFilter
 
-public trait FilenameFilter : java.lang.Object {
+public trait FilenameFilter {
     public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: kotlin.String?): kotlin.Boolean
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt

@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T?) -> T?): test.GenericInterfaceParameterWithSelfBound<T>
 
-public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> : java.lang.Object {
+public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> {
     public abstract fun method(/*0*/ p0: T?): T?
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt

@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<out A>?, B?) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : java.lang.Cloneable?
 
-public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> : java.lang.Object where A : java.lang.Cloneable? {
+public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> where A : java.lang.Cloneable? {
     public abstract fun method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt

@@ -1,5 +1,5 @@
 package test
 
-public trait GenericMethodParameters : java.lang.Object {
+public trait GenericMethodParameters {
     public abstract fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt

@@ -1,4 +1,4 @@
 package test
 
-public trait InterfaceWithObjectMethod : java.lang.Object {
+public trait InterfaceWithObjectMethod {
 }

compiler/testData/loadJava/compiledJava/sam/Nested.txt

@@ -1,23 +1,23 @@
 package test
 
-public trait Nested : java.lang.Object {
+public trait Nested {
 
-    public trait Deeper1 : java.lang.Object {
+    public trait Deeper1 {
 
-        public trait Runnable : java.lang.Object {
+        public trait Runnable {
             public abstract fun run(): kotlin.Unit
             public abstract fun run2(): kotlin.Unit
         }
     }
 
-    public trait Deeper2 : java.lang.Object {
+    public trait Deeper2 {
 
-        public trait Runnable : java.lang.Object {
+        public trait Runnable {
             public abstract fun run(): kotlin.Unit
         }
     }
 
-    public trait Runnable : java.lang.Object {
+    public trait Runnable {
         public abstract fun run(): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/sam/Runnable.txt

@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable
 
-public trait Runnable : java.lang.Object {
+public trait Runnable {
     public abstract fun run(): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt

@@ -1,16 +1,16 @@
 package test
 
-public trait SamSubinterfaceOfTwo : java.lang.Object {
+public trait SamSubinterfaceOfTwo {
 
     public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String?
     }
 
-    public trait Super1 : java.lang.Object {
+    public trait Super1 {
         public abstract fun f(): kotlin.CharSequence?
     }
 
-    public trait Super2</*0*/ T> : java.lang.Object {
+    public trait Super2</*0*/ T> {
         public abstract fun f(): T?
     }
 }

compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt

@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<kotlin.String?>) -> kotlin.Unit): test.VarargParameter
 
-public trait VarargParameter : java.lang.Object {
+public trait VarargParameter {
     public abstract fun f(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
 }

compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class AmbiguousAdapters : java.lang.Object {
+public open class AmbiguousAdapters {
     public constructor AmbiguousAdapters()
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class Basic : java.lang.Object {
+public open class Basic {
     public constructor Basic()
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class Constructor : java.lang.Object {
+public open class Constructor {
     public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)?)
     public constructor Constructor(/*0*/ p0: java.lang.Runnable?)
 }

compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait DeepSamLoop : java.lang.Object {
+public trait DeepSamLoop {
 
-    public trait Bar : java.lang.Object {
+    public trait Bar {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar?) -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo?): kotlin.Unit
     }
 
-    public trait Foo : java.lang.Object {
+    public trait Foo {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo?) -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar?): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class NonTrivialFunctionType : java.lang.Object {
+public open class NonTrivialFunctionType {
     public constructor NonTrivialFunctionType()
     public final /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, kotlin.String) -> kotlin.Boolean)?): kotlin.Unit
     public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt

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

compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class SeveralSamParameters : java.lang.Object {
+public open class SeveralSamParameters {
     public constructor SeveralSamParameters()
 }
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class TypeParameterOfClass</*0*/ T> : java.lang.Object {
+public open class TypeParameterOfClass</*0*/ T> {
     public constructor TypeParameterOfClass</*0*/ T>()
     public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
     public open fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class TypeParameterOfMethod : java.lang.Object {
+public open class TypeParameterOfMethod {
     public constructor TypeParameterOfMethod()
 }
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt

@@ -1,9 +1,9 @@
 package test
 
-public open class TypeParameterOfOuterClass</*0*/ T> : java.lang.Object {
+public open class TypeParameterOfOuterClass</*0*/ T> {
     public constructor TypeParameterOfOuterClass</*0*/ T>()
 
-    public open inner class Inner : java.lang.Object {
+    public open inner class Inner {
         public constructor Inner()
         public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
         public open fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait AdapterDoesntOverrideDeclaration : java.lang.Object {
+public trait AdapterDoesntOverrideDeclaration {
 
     public trait Sub : test.AdapterDoesntOverrideDeclaration.Super {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
@@ -8,7 +8,7 @@ public trait AdapterDoesntOverrideDeclaration : java.lang.Object {
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait InheritedAdapterAndDeclaration : java.lang.Object {
+public trait InheritedAdapterAndDeclaration {
 
     public trait Sub : test.InheritedAdapterAndDeclaration.Super {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
@@ -8,7 +8,7 @@ public trait InheritedAdapterAndDeclaration : java.lang.Object {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait InheritedAmbiguousAdapters : java.lang.Object {
+public trait InheritedAmbiguousAdapters {
 
     public trait Sub : test.InheritedAmbiguousAdapters.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
@@ -9,7 +9,7 @@ public trait InheritedAmbiguousAdapters : java.lang.Object {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait InheritedAndOverriddenAmbiguousAdapters : java.lang.Object {
+public trait InheritedAndOverriddenAmbiguousAdapters {
 
     public trait Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
@@ -9,7 +9,7 @@ public trait InheritedAndOverriddenAmbiguousAdapters : java.lang.Object {
         public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt

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

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt

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

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait InheritedSameAdapters : java.lang.Object {
+public trait InheritedSameAdapters {
 
     public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
         public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super1 : java.lang.Object {
+    public trait Super1 {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super2 : java.lang.Object {
+    public trait Super2 {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt

@@ -1,18 +1,18 @@
 package test
 
-public trait InheritedSameAdaptersWithSubstitution : java.lang.Object {
+public trait InheritedSameAdaptersWithSubstitution {
 
     public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
         public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
         public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
     }
 
-    public trait Super1 : java.lang.Object {
+    public trait Super1 {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
     }
 
-    public trait Super2</*0*/ T> : java.lang.Object {
+    public trait Super2</*0*/ T> {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt

@@ -1,13 +1,13 @@
 package test
 
-public trait InheritedSimple : java.lang.Object {
+public trait InheritedSimple {
 
     public trait Sub : test.InheritedSimple.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait OverriddenAmbiguousAdapters : java.lang.Object {
+public trait OverriddenAmbiguousAdapters {
 
     public trait Sub : test.OverriddenAmbiguousAdapters.Super {
         public abstract override /*2*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
@@ -8,7 +8,7 @@ public trait OverriddenAmbiguousAdapters : java.lang.Object {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit

compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait ArraysInSubtypes : java.lang.Object {
+public trait ArraysInSubtypes {
 
     public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
         public abstract override /*1*/ fun array(): kotlin.Array<kotlin.String>?
@@ -8,7 +8,7 @@ public trait ArraysInSubtypes : java.lang.Object {
         public abstract override /*1*/ fun objArray(): kotlin.Array<T>?
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public abstract fun array(): kotlin.Array<kotlin.CharSequence>?
         public abstract fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.CharSequence>?>?
         public abstract fun objArray(): kotlin.Array<kotlin.Any>?

compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt

@@ -1,8 +1,8 @@
 package test
 
-public trait MethodTypeParameterErased : java.lang.Object {
+public trait MethodTypeParameterErased {
 
-    public trait Bug</*0*/ T> : java.lang.Object {
+    public trait Bug</*0*/ T> {
         public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save(): RET?
     }
 

compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class RawSuperType : java.lang.Object {
+public open class RawSuperType {
     public constructor RawSuperType()
 
     public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
@@ -8,7 +8,7 @@ public open class RawSuperType : java.lang.Object {
         public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit
     }
 
-    public trait Super</*0*/ T> : java.lang.Object {
+    public trait Super</*0*/ T> {
         public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt

@@ -1,6 +1,6 @@
 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>()
@@ -11,10 +11,10 @@ public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
         }
     }
 
-    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/compiledJava/signaturePropagation/SubclassWithRawType.txt

@@ -1,6 +1,6 @@
 package test
 
-public trait SubclassWithRawType : java.lang.Object {
+public trait SubclassWithRawType {
 
     public trait Sub : test.SubclassWithRawType.Super {
         public abstract override /*1*/ fun array1(): kotlin.Array<kotlin.List<kotlin.String?>>?
@@ -13,7 +13,7 @@ public trait SubclassWithRawType : java.lang.Object {
         public abstract override /*1*/ fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
     }
 
-    public trait Super : java.lang.Object {
+    public trait Super {
         public abstract fun array1(): kotlin.Array<kotlin.List<kotlin.Any?>>?
         public abstract fun array2(): kotlin.Array<kotlin.List<kotlin.String>>?
         public abstract fun boundWildcard1(): kotlin.MutableList<out kotlin.List<kotlin.Any?>?>?

compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt

@@ -2,10 +2,10 @@ package test
 
 public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.MutableList<kotlin.String?>): test.TwoSuperclassesInconsistentGenericTypes
 
-public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
+public trait TwoSuperclassesInconsistentGenericTypes {
     public abstract fun foo(): kotlin.MutableList<kotlin.String?>
 
-    public trait Other : java.lang.Object {
+    public trait Other {
         public abstract fun foo(): kotlin.MutableList<kotlin.String>?
     }
 

compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt

@@ -1,17 +1,17 @@
 package test
 
-public trait TwoSuperclassesVarargAndNot : java.lang.Object {
+public trait TwoSuperclassesVarargAndNot {
 
     public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
     }
 
-    public trait Super1 : java.lang.Object {
+    public trait Super1 {
         public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
     }
 
-    public trait Super2 : java.lang.Object {
+    public trait Super2 {
         public abstract fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
     }
 }

compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt

@@ -1,17 +1,17 @@
 package test
 
-public open class DeeplyInnerClass : java.lang.Object {
+public open class DeeplyInnerClass {
     public constructor DeeplyInnerClass()
 
-    public/*package*/ open inner class A : java.lang.Object {
+    public/*package*/ open inner class A {
         public/*package*/ constructor A()
         public/*package*/ open fun a(): kotlin.Unit
 
-        public/*package*/ open inner class B : java.lang.Object {
+        public/*package*/ open inner class B {
             public/*package*/ constructor B()
             public/*package*/ open fun b(): kotlin.Unit
 
-            public/*package*/ open inner class C : java.lang.Object {
+            public/*package*/ open inner class C {
                 public/*package*/ constructor C()
                 public/*package*/ open fun c(): kotlin.Unit
             }

compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt

@@ -1,12 +1,12 @@
 package test
 
-public open class DeeplyNestedStatic : java.lang.Object {
+public open class DeeplyNestedStatic {
     public constructor DeeplyNestedStatic()
 
-    public open class Foo : java.lang.Object {
+    public open class Foo {
         public constructor Foo()
 
-        public open class Bar : java.lang.Object {
+        public open class Bar {
             public constructor Bar()
         }
     }

compiler/testData/loadJava/compiledJava/static/Enum.txt

@@ -47,13 +47,13 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
         }
     }
 
-    public open inner class Inner : java.lang.Object {
+    public open inner class Inner {
         public constructor Inner()
         public/*package*/ open fun bar(): kotlin.Unit
         public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String?): kotlin.Unit
     }
 
-    public open class Nested : java.lang.Object {
+    public open class Nested {
         public constructor Nested()
         public/*package*/ open fun foo(): kotlin.Unit
         public/*package*/ open fun values(): kotlin.Unit

compiler/testData/loadJava/compiledJava/static/InnerClass.txt

@@ -1,14 +1,14 @@
 package test
 
-public open class InnerClass : java.lang.Object {
+public open class InnerClass {
     public constructor InnerClass()
 
-    public open inner class Inner : java.lang.Object {
+    public open inner class Inner {
         public constructor Inner()
         public open fun foo(): kotlin.Unit
     }
 
-    public open class Nested : java.lang.Object {
+    public open class Nested {
         public constructor Nested()
         public open fun bar(): kotlin.Unit
     }

compiler/testData/loadJava/compiledJava/static/Simple.txt

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

compiler/testData/loadJava/compiledJava/static/StaticFinal.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class StaticFinal : java.lang.Object {
+public open class StaticFinal {
     public constructor StaticFinal()
 }
 

compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt

@@ -3,7 +3,7 @@ package test
 public /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.SamInterface
 public fun topLevelFunction(): kotlin.Unit
 
-public open class JavaClass : java.lang.Object {
+public open class JavaClass {
     public constructor JavaClass()
     public open fun instanceMethod(): kotlin.Unit
 }
@@ -12,7 +12,7 @@ public final class KotlinClass {
     public constructor KotlinClass()
 }
 
-public trait SamInterface : java.lang.Object {
+public trait SamInterface {
     public abstract fun instanceMethod(): kotlin.Unit
 }
 
@@ -22,7 +22,7 @@ package test.JavaClass {
 
 package test.sub {
 
-    public open class JavaClassInSubpackage : java.lang.Object {
+    public open class JavaClassInSubpackage {
         public constructor JavaClassInSubpackage()
         public open fun instanceMethod(): kotlin.Unit
     }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.kt

@@ -1,6 +1,6 @@
 package test
 
-public class ArrayTypeVariance : java.lang.Object() {
+public class ArrayTypeVariance {
     public fun toArray(p0: Array<out Any>?): Array<Any>? {
         throw UnsupportedOperationException()
     }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt

@@ -1,6 +1,6 @@
 package test
 
-public final class ArrayTypeVariance : java.lang.Object {
+public final class ArrayTypeVariance {
     public constructor ArrayTypeVariance()
     public final fun toArray(/*0*/ p0: kotlin.Array<out kotlin.Any>?): kotlin.Array<kotlin.Any>?
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.kt

@@ -1,6 +1,6 @@
 package test
 
-public class ClassWithConstVal() : java.lang.Object() {
+public class ClassWithConstVal() {
     public val f: Int = 1
     public val f2: Int = f
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.txt

@@ -1,6 +1,6 @@
 package test
 
-public final class ClassWithConstVal : java.lang.Object {
+public final class ClassWithConstVal {
     public constructor ClassWithConstVal()
     public final val f: kotlin.Int = 1
     public final val f2: kotlin.Int = 1

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.kt

@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypeP<P>() : java.lang.Object() {
+public class ClassWithTypeP<P>() {
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.txt

@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypeP</*0*/ P> : java.lang.Object {
+public final class ClassWithTypeP</*0*/ P> {
     public constructor ClassWithTypeP</*0*/ P>()
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.kt

@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePP<P, Q : P>() : java.lang.Object() {
+public class ClassWithTypePP<P, Q : P>() {
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.txt

@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P> : java.lang.Object {
+public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P> {
     public constructor ClassWithTypePP</*0*/ P, /*1*/ Q : P>()
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt

@@ -1,3 +1,3 @@
 package test
 
-public open class ClassWithTypePRefNext<R : kotlin.Iterable<P>?, P>() : java.lang.Object()
+public open class ClassWithTypePRefNext<R : kotlin.Iterable<P>?, P>()

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt

@@ -1,5 +1,5 @@
 package test
 
-public open class ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P> : java.lang.Object {
+public open class ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P> {
     public constructor ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P>()
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt

@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePRefSelf<P : kotlin.Enum<P>?>() : java.lang.Object() {
+public class ClassWithTypePRefSelf<P : kotlin.Enum<P>?>() {
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt

@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?> : java.lang.Object {
+public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?> {
     public constructor ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?>()
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.kt

@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePRefSelfAndClass<P: ClassWithTypePRefSelfAndClass<P>?>(): Object() {
+public class ClassWithTypePRefSelfAndClass<P: ClassWithTypePRefSelfAndClass<P>?>() {
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.txt

@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?> : java.lang.Object {
+public final class ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?> {
     public constructor ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?>()
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.kt

@@ -1,5 +1,5 @@
 package test
 
-public class FieldAsVar() : java.lang.Object() {
+public class FieldAsVar() {
     public var f: Int = 1
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt

@@ -1,6 +1,6 @@
 package test
 
-public final class FieldAsVar : java.lang.Object {
+public final class FieldAsVar {
     public constructor FieldAsVar()
     public final var f: kotlin.Int
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.kt

@@ -1,5 +1,5 @@
 package test
 
-public open class FieldOfArrayType() : java.lang.Object() {
+public open class FieldOfArrayType() {
     public var files: Array<java.io.File>? = null
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt

@@ -1,6 +1,6 @@
 package test
 
-public open class FieldOfArrayType : java.lang.Object {
+public open class FieldOfArrayType {
     public constructor FieldOfArrayType()
     public final var files: kotlin.Array<java.io.File>?
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.kt

@@ -1,6 +1,6 @@
 //ALLOW_AST_ACCESS
 package test
 
-public class FinalFieldAsVal() : java.lang.Object() {
+public class FinalFieldAsVal() {
     public val f: Int = 1
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt

@@ -1,6 +1,6 @@
 package test
 
-public final class FinalFieldAsVal : java.lang.Object {
+public final class FinalFieldAsVal {
     public constructor FinalFieldAsVal()
     public final val f: kotlin.Int = 1
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.kt

@@ -1,12 +1,12 @@
 package test
 
-public class InheritMethodsDifferentReturnTypes: Object() {
+public class InheritMethodsDifferentReturnTypes {
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): CharSequence?
         public fun bar(): String?
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): String?
         public fun bar(): CharSequence?
     }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt

@@ -1,6 +1,6 @@
 package test
 
-public final class InheritMethodsDifferentReturnTypes : java.lang.Object {
+public final class InheritMethodsDifferentReturnTypes {
     public constructor InheritMethodsDifferentReturnTypes()
 
     public trait Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 {
@@ -8,12 +8,12 @@ public final class InheritMethodsDifferentReturnTypes : java.lang.Object {
         public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String?
     }
 
-    public trait Super1 : java.lang.Object {
+    public trait Super1 {
         public abstract fun bar(): kotlin.String?
         public abstract fun foo(): kotlin.CharSequence?
     }
 
-    public trait Super2 : java.lang.Object {
+    public trait Super2 {
         public abstract fun bar(): kotlin.CharSequence?
         public abstract fun foo(): kotlin.String?
     }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.kt

@@ -1,12 +1,12 @@
 package test
 
-public class InheritMethodsDifferentReturnTypesGeneric: Object() {
+public class InheritMethodsDifferentReturnTypesGeneric {
-    public trait Super1<F, B>: Object {
+    public trait Super1<F, B> {
         public fun foo(): F?
         public fun bar(): B?
     }
 
-    public trait Super2<FF, BB>: Object {
+    public trait Super2<FF, BB> {
         public fun foo(): FF?
         public fun bar(): BB?
     }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt

@@ -1,6 +1,6 @@
 package test
 
-public final class InheritMethodsDifferentReturnTypesGeneric : java.lang.Object {
+public final class InheritMethodsDifferentReturnTypesGeneric {
     public constructor InheritMethodsDifferentReturnTypesGeneric()
 
     public trait Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin.String, kotlin.CharSequence>, test.InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin.CharSequence, kotlin.String> {
@@ -8,12 +8,12 @@ public final class InheritMethodsDifferentReturnTypesGeneric : java.lang.Object
         public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String?
     }
 
-    public trait Super1</*0*/ F, /*1*/ B> : java.lang.Object {
+    public trait Super1</*0*/ F, /*1*/ B> {
         public abstract fun bar(): B?
         public abstract fun foo(): F?
     }
 
-    public trait Super2</*0*/ FF, /*1*/ BB> : java.lang.Object {
+    public trait Super2</*0*/ FF, /*1*/ BB> {
         public abstract fun bar(): BB?
         public abstract fun foo(): FF?
     }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.kt

@@ -1,5 +1,5 @@
 package test
 
-public open class InnerClass() : java.lang.Object() {
+public open class InnerClass() {
-    public inner open class Inner() : java.lang.Object()
+    public inner open class Inner()
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.txt

@@ -1,9 +1,9 @@
 package test
 
-public open class InnerClass : java.lang.Object {
+public open class InnerClass {
     public constructor InnerClass()
 
-    public open inner class Inner : java.lang.Object {
+    public open inner class Inner {
         public constructor Inner()
     }
 }

compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.kt

@@ -1,5 +1,5 @@
 package test
 
-public open class InnerClassReferencesOuterTP<P>() : java.lang.Object() {
+public open class InnerClassReferencesOuterTP<P>() {
-    public open inner class Inner<Q : P>() : java.lang.Object()
+    public open inner class Inner<Q : P>()
 }