Don't make traits and annotations inherit from KObject

#KT-5609 Fixed
This commit is contained in:
Alexander Udalov
2014-08-12 12:03:32 +04:00
parent 47d5f83d04
commit 226bfe65f0
10 changed files with 44 additions and 14 deletions
@@ -1,4 +1,4 @@
public interface Generic <N, NN> extends kotlin.jvm.internal.KObject {
public interface Generic <N, NN> {
N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
@org.jetbrains.annotations.NotNull
@@ -1,4 +1,4 @@
public interface Primitives extends kotlin.jvm.internal.KObject {
public interface Primitives {
int $$int /* Real name is 'int' */(@jet.runtime.typeinfo.JetValueParameter(name = "x") int x);
@org.jetbrains.annotations.Nullable
@@ -1,4 +1,4 @@
public interface PrivateInTrait extends kotlin.jvm.internal.KObject {
public interface PrivateInTrait {
@org.jetbrains.annotations.NotNull
java.lang.String getNn();
@@ -1,4 +1,4 @@
public interface Trait extends kotlin.jvm.internal.KObject {
public interface Trait {
@org.jetbrains.annotations.NotNull
java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a);
@@ -1,4 +1,4 @@
public interface TraitClassObjectField extends kotlin.jvm.internal.KObject {
public interface TraitClassObjectField {
TraitClassObjectField.object OBJECT$;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
@@ -0,0 +1,30 @@
// KT-5609: interfaces should not inherit from KObject, unless explicitly said so
trait A
trait B : kotlin.jvm.internal.KObject
annotation class C
class D
class E : kotlin.jvm.internal.KObject
fun box(): String {
val a = javaClass<A>().getGenericInterfaces().toList()
if (a.toString() != "[]") return "Fail A: $a"
val b = javaClass<B>().getGenericInterfaces().toList()
if (b.toString() != "[interface kotlin.jvm.internal.KObject]") return "Fail B: $b"
val c = javaClass<C>().getGenericInterfaces().toList()
if (c.toString() != "[interface java.lang.annotation.Annotation]") return "Fail C: $c"
val d = javaClass<D>().getGenericInterfaces().toList()
if (d.toString() != "[interface kotlin.jvm.internal.KObject]") return "Fail D: $d"
val e = javaClass<E>().getGenericInterfaces().toList()
if (e.toString() != "[interface kotlin.jvm.internal.KObject]") return "Fail E: $e"
return "OK"
}
@@ -3,4 +3,4 @@ trait Derived<A>: List<A>
// class: Derived
// jvm signature: Derived
// generic signature: <A:Ljava/lang/Object;>Ljava/lang/Object;Lkotlin/jvm/internal/KObject;Ljava/util/List<TA;>;
// generic signature: <A:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/List<TA;>;