Introduce 'reified' instead of 'erased'

compiler/testData/codegen/regressions/kt1199.kt

@@ -1,4 +1,4 @@
-fun <erased T : Any> T?.iterator() = object {
+fun <T : Any> T?.iterator() = object {
     var hasNext = this@iterator != null
       private set
 

compiler/testData/codegen/regressions/kt602.jet

@@ -1 +1,2 @@
 fun box() = if(arrayOfNulls<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"
+

compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet

@@ -3,7 +3,7 @@ class Box<T>(t: T) {
 }
 
 fun isIntBox(box: Box<out Any?>): Boolean {
-    return box is Box<Int>;
+    return box is Box<*>;
 }
 
 

compiler/testData/diagnostics/tests/cast/IsReified.jet

@@ -1,3 +1,3 @@
 class MyList<T>
 
-fun ff(a: Any) = a is MyList<String>
+fun ff(a: Any) = a is <!CANNOT_CHECK_FOR_ERASED!>MyList<String><!>

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.jet

@@ -2,7 +2,7 @@
 package kt1189
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
-inline fun <erased T> ReentrantReadWriteLock.write(action: ()->T) : T {
+inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
     val rl = readLock().sure()
     var readCount = 0
     val writeCount = getWriteHoldCount()

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.jet

@@ -7,7 +7,7 @@ trait FunctionalList<T> {
     val tail: FunctionalList<T>
 }
 
-fun <erased T> FunctionalList<T>.plus(element: T) : FunctionalList<T> = object: FunctionalList<T> {
+fun <T> FunctionalList<T>.plus(element: T) : FunctionalList<T> = object: FunctionalList<T> {
     override val size: Int
     get() = 1 + this@plus.size
     override val tail: FunctionalList<T>

compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt

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

compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt

@@ -1,4 +1,4 @@
 package test
 
-abstract class ClassTypeTypePRefSuper<erased P>() : java.lang.Iterable<P> {
+abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
 }

compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt

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

compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt

@@ -1,5 +1,5 @@
 package test
 
-trait Foo<erased Q> : java.lang.Object
+trait Foo<Q> : java.lang.Object
 
-open class ClassWithTypePRefNext<erased R : Foo<P>?, erased P>() : java.lang.Object()
+open class ClassWithTypePRefNext<R : Foo<P>?, P>() : java.lang.Object()

compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt

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

compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt

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

compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt

@@ -1,8 +1,8 @@
 package test
 
-trait Trait<erased P> : java.lang.Object
+trait Trait<P> : java.lang.Object
 
-open class Outer<erased P, erased Q>() : java.lang.Object() {
+open class Outer<P, Q>() : java.lang.Object() {
     open class Inner() : java.lang.Object() {
     }
     

compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt

@@ -1,7 +1,7 @@
 package test
 
-class Outer<erased P>() : java.lang.Object() {
+class Outer<P>() : java.lang.Object() {
     class Inner() : java.lang.Object() {
-        fun f<erased Q : P>() {}
+        fun f<Q : P>() {}
     }
 }

compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt

@@ -3,5 +3,5 @@ package test
 trait Foo : java.lang.Object
 
 open class MethodTypePOneUpperBound() : java.lang.Object() {
-    open fun <erased T : Foo?> bar() = #()
+    open fun <T : Foo?> bar() = #()
 }

compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt

@@ -4,7 +4,7 @@ trait Foo : java.lang.Object
 trait Bar : java.lang.Object
 
 open class MethodTypePTwoUpperBounds() : java.lang.Object() {
-    open fun <erased T> foo(): Unit
+    open fun <T> foo(): Unit
         where T : Foo?, T : Bar?
     {}
 }

compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt

@@ -1,5 +1,5 @@
 package test
 
 class MethodWithTypeP() : java.lang.Object() {
-    fun <erased P> f() = #()
+    fun <P> f() = #()
 }

compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt

@@ -1,5 +1,5 @@
 package test
 
 class MethodWithTypePP() : java.lang.Object() {
-    fun <erased P, erased Q : P> f() = #()
+    fun <P, Q : P> f() = #()
 }

compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt

@@ -1,5 +1,5 @@
 package test
 
-open class MethodWithTypePRefClassP<erased P>() : java.lang.Object() {
-    fun <erased Q : P> f() = #()
+open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
+    fun <Q : P> f() = #()
 }

compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt

@@ -1,5 +1,5 @@
 package test
 
 final class MethosWithPRefTP() : java.lang.Object() {
-    fun <erased P> f(p0: P?) = #()
+    fun <P> f(p0: P?) = #()
 }

compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt

@@ -2,7 +2,7 @@ package test
 
 import java.util.ArrayList
 
-open class JavaBeanVarOfGenericType<erased P>() : java.lang.Object() {
+open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
     open fun getCharacters(): ArrayList<P>? = null
     open fun setCharacters(p0: ArrayList<P>?) { }
     //var characters: ArrayList<P>? = null

compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Wine</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Wine<T>
+final class test.Wine</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Wine<T>
 }

compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Juice</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Juice<T>
+final class test.Juice</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Juice<T>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParam.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Beer</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Beer<T>
+final class test.Beer</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Beer<T>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassParamReferencesParam</*0,r*/ A : jet.Any?, /*1,r*/ B : A> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
+final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassParamReferencesParam</*0,r*/ A : jet.Any?, /*1,r*/ in B : A> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
+final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ in B : A> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt

@@ -1,7 +1,7 @@
 namespace test
 
-final class test.ClassParamReferencesSelf</*0,r*/ A : test.TraitWithP<A>> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
+final class test.ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
 }
-abstract trait test.TraitWithP</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.TraitWithP</*0*/ P : jet.Any?> : jet.Any {
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.lang.Number><init>(): test.Clock<A>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.io.Serializable> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable><init>(): test.Clock<A>
 }

compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }

compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassTwoParams</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+final class test.ClassTwoParams</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }

compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassTwoParams</*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+final class test.ClassTwoParams</*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }

compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt

@@ -1,7 +1,7 @@
 namespace test
 
-abstract class test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.Aaa<P>
+abstract class test.Aaa</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Aaa<P>
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
     final /*constructor*/ fun <init>(): test.Bbb

compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt

@@ -1,6 +1,6 @@
 namespace test
 
-abstract trait test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.Aaa</*0*/ P : jet.Any?> : jet.Any {
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
     final /*constructor*/ fun <init>(): test.Bbb

compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassParamUsedInFun</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
+final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
     final fun f(/*0*/ t: T): jet.Int
 }

compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassParamUsedInFun</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
+final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
     final fun f(/*0*/ t: T): jet.Int
 }

compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt

@@ -1,7 +1,7 @@
 namespace test
 
-open class test.Base</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Base<T>
+open class test.Base</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
     final fun foo(): T
 }
 final class test.Inh : test.Base<jet.String> {

compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt

@@ -1,6 +1,6 @@
 namespace test
 
-abstract trait test.Bbb</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
 }
 final class test.ClassObjectExtendsTraitWithTP : jet.Any {
     final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP

compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
 }

compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
 }

compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
 }

compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
 }

compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt

@@ -1,3 +1,3 @@
 package test
 
-class OneTypeParameterErased<P, erased Q>(q: Q)
+class OneTypeParameterErased<P, Q>(q: Q)

compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt

@@ -1,5 +1,5 @@
 namespace test
 
-final class test.OneTypeParameterErased</*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
+final class test.OneTypeParameterErased</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
 }

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ T : jet.Any?>f(): jet.Int
+final fun </*0*/ T : jet.Any?>f(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ in T : jet.Any?>f(): jet.Int
+final fun </*0*/ in T : jet.Any?>f(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ out T : jet.Any?>f(): jet.Int
+final fun </*0*/ out T : jet.Any?>f(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt

@@ -1,3 +1,3 @@
 package test
 
-fun <erased P> funParamParam(a: Int, b: P) = 1
+fun <P> funParamParam(a: Int, b: P) = 1

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ in P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
+final fun </*0*/ in P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt

@@ -4,4 +4,4 @@ abstract trait test.Bar : jet.Any {
 }
 abstract trait test.Foo : jet.Any {
 }
-final fun </*0,r*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
+final fun </*0*/ T : test.Bar & test.Foo>foo(): jet.Tuple0

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.lang.Number>uno(): jet.Int
+final fun </*0*/ A : java.lang.Number>uno(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
+final fun </*0*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.io.Serializable>dos(): jet.Int
+final fun </*0*/ A : java.io.Serializable>dos(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
+final fun </*0*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
+final fun </*0*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?>funTwoTypeParams(): jet.Int

compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?, /*1,r*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int

compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final val  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+final val  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>

compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ExtValInClass<T>
+final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
     final val jet.Int.asas: T
 }

compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
     final val jet.Int.asas: P?
 }

compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
     final val P.asas: jet.Int
 }

compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+final var  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>

compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
     final var jet.Int.asas: P
 }

compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
     final var jet.Int.asas: P?
 }

compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt

@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
+final var  </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int

compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
     final var P.asas: jet.Int
 }

compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt

@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
     final var P?.asas: jet.Int
 }

compiler/testData/writeSignature/VarargGeneric.kt

@@ -3,6 +3,6 @@ fun <P> foo(vararg tail: P) = 1
 // method: namespace::foo
 // jvm signature:     ([Ljava/lang/Object;)I
 // generic signature: <P:Ljava/lang/Object;>([TP;)I
-// kotlin signature:  <P:?Ljava/lang/Object;>([TP;)I
+// kotlin signature:  <erased P:?Ljava/lang/Object;>([TP;)I
 // TODO: skip kotlin signature
 // TODO: properly serialize typeinfo