diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
new file mode 100644
index 00000000000..2388cc9b8c2
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
@@ -0,0 +1,27 @@
+namespace test
+
+abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
+    final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
+    open override /*1*/ fun after(/*0*/ p0: java.util.Date?): jet.Boolean
+    open override /*1*/ fun before(/*0*/ p0: java.util.Date?): jet.Boolean
+    open override /*1*/ fun compareTo(/*0*/ p0: java.util.Date?): jet.Int
+    open override /*1*/ fun compareTo(/*0*/ p0: jet.Any?): jet.Int
+    open override /*1*/ fun getDate(): jet.Int
+    open override /*1*/ fun getDay(): jet.Int
+    open override /*1*/ fun getHours(): jet.Int
+    open override /*1*/ fun getMinutes(): jet.Int
+    open override /*1*/ fun getMonth(): jet.Int
+    open override /*1*/ fun getSeconds(): jet.Int
+    open override /*1*/ fun getTime(): jet.Long
+    open override /*1*/ fun getTimezoneOffset(): jet.Int
+    open override /*1*/ fun getYear(): jet.Int
+    open override /*1*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
+    open override /*1*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
+    open override /*1*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
+    open override /*1*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
+    open override /*1*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
+    open override /*1*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
+    open override /*1*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
+    open override /*1*/ fun toGMTString(): jet.String?
+    open override /*1*/ fun toLocaleString(): jet.String?
+}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
new file mode 100644
index 00000000000..d9abe09d3f2
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.ClassWithTypeParameter</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypeParameter</*0*/ P : jet.Any?>
+}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
new file mode 100644
index 00000000000..1d1203ffc98
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : P><init>(): test.ClassWithTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : P>
+}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
new file mode 100644
index 00000000000..9cb3ef6af83
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : java.lang.Enum<P>?><init>(): test.ClassWithTypePRefSelf</*0*/ P : java.lang.Enum<P>?>
+}
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.txt b/compiler/testData/readJavaBinaryClass/FieldAsVar.txt
new file mode 100644
index 00000000000..ecd26be5bf8
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/FieldAsVar.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.FieldAsVar : jet.Any {
+    final /*constructor*/ fun <init>(): test.FieldAsVar
+    var f: jet.Int
+}
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
new file mode 100644
index 00000000000..244c73709b9
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
@@ -0,0 +1,6 @@
+namespace test
+
+open class test.FieldOfArrayType : jet.Any {
+    final /*constructor*/ fun <init>(): test.FieldOfArrayType
+    var files: jet.Array<java.io.File?>?
+}
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
new file mode 100644
index 00000000000..48aa1f3177a
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.FinalFieldAsVal : jet.Any {
+    final /*constructor*/ fun <init>(): test.FinalFieldAsVal
+    val f: jet.Int
+}
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.txt b/compiler/testData/readJavaBinaryClass/InnerClass.txt
new file mode 100644
index 00000000000..9acf1552262
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/InnerClass.txt
@@ -0,0 +1,8 @@
+namespace test
+
+open class test.Outer : jet.Any {
+    final /*constructor*/ fun <init>(): test.Outer
+    open class test.Outer.Inner : jet.Any {
+        final /*constructor*/ fun <init>(): test.Outer.Inner
+    }
+}
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
new file mode 100644
index 00000000000..5d3c90efeef
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
@@ -0,0 +1,8 @@
+namespace test
+
+open class test.Outer</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer</*0*/ P : jet.Any?>
+    open class test.Outer.Inner</*0*/ Q : P> : jet.Any {
+        final /*constructor*/ fun </*0*/ Q : P><init>(): test.Outer.Inner</*0*/ Q : P>
+    }
+}
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
new file mode 100644
index 00000000000..5255619fb4c
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
@@ -0,0 +1,9 @@
+namespace test
+
+final class test.Outer</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Outer</*0*/ P : jet.Any?>
+    final class test.Outer.Inner : jet.Any {
+        final /*constructor*/ fun <init>(): test.Outer.Inner
+        final fun </*0*/ Q : P>f(): jet.Tuple0
+    }
+}
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
new file mode 100644
index 00000000000..977bce6fbdc
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.MethodWithTypeP : jet.Any {
+    final /*constructor*/ fun <init>(): test.MethodWithTypeP
+    final fun </*0*/ P : jet.Any?>f(): jet.Tuple0
+}
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
new file mode 100644
index 00000000000..4b6ca937710
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.MethodWithTypePP : jet.Any {
+    final /*constructor*/ fun <init>(): test.MethodWithTypePP
+    final fun </*0*/ P : jet.Any?, /*1*/ Q : P>f(): jet.Tuple0
+}
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
new file mode 100644
index 00000000000..12c852f8b42
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
@@ -0,0 +1,6 @@
+namespace test
+
+open class test.MethodWithTypePRefClassP</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.MethodWithTypePRefClassP</*0*/ P : jet.Any?>
+    final fun </*0*/ Q : P>f(): jet.Tuple0
+}
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
new file mode 100644
index 00000000000..8383dae7829
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.MethosWithPRefTP : jet.Any {
+    final /*constructor*/ fun <init>(): test.MethosWithPRefTP
+    final fun </*0*/ P : jet.Any?>f(/*0*/ p0: P): jet.Tuple0
+}
diff --git a/compiler/testData/readJavaBinaryClass/Simple.txt b/compiler/testData/readJavaBinaryClass/Simple.txt
new file mode 100644
index 00000000000..1a08ed4477a
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/Simple.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.Simple : jet.Any {
+    final /*constructor*/ fun <init>(): test.Simple
+}
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.txt b/compiler/testData/readJavaBinaryClass/TwoFields.txt
new file mode 100644
index 00000000000..1327f449a1f
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/TwoFields.txt
@@ -0,0 +1,7 @@
+namespace test
+
+final class test.TwoFields : jet.Any {
+    final /*constructor*/ fun <init>(): test.TwoFields
+    var a: jet.Int
+    var b: jet.Short
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/Class.txt b/compiler/testData/readKotlinBinaryClass/class/Class.txt
new file mode 100644
index 00000000000..997d86eccb8
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/Class.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.Ramification : jet.Any {
+    final /*constructor*/ fun <init>(): test.Ramification
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
new file mode 100644
index 00000000000..964689a49e7
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
@@ -0,0 +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</*0,r*/ in T : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt b/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
new file mode 100644
index 00000000000..498372ec0f8
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
@@ -0,0 +1,8 @@
+namespace test
+
+final class test.Outer : jet.Any {
+    final /*constructor*/ fun <init>(): test.Outer
+    final class test.Outer.Inner : jet.Any {
+        final /*constructor*/ fun <init>(): test.Outer.Inner
+    }
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
new file mode 100644
index 00000000000..213fbfd6a69
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
@@ -0,0 +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</*0,r*/ in T : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
new file mode 100644
index 00000000000..3ba861bf9a1
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
@@ -0,0 +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</*0,r*/ T : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
new file mode 100644
index 00000000000..c03192a19bd
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
@@ -0,0 +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</*0,r*/ A : jet.Any?, /*1,r*/ B : A>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
new file mode 100644
index 00000000000..78c2af21bae
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
@@ -0,0 +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</*0,r*/ A : jet.Any?, /*1,r*/ in B : A>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
new file mode 100644
index 00000000000..bb5c286bdd5
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
@@ -0,0 +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</*0,r*/ A : java.lang.Number>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
new file mode 100644
index 00000000000..78aea4bac30
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
@@ -0,0 +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</*0,r*/ A : java.io.Serializable & java.lang.Number>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
new file mode 100644
index 00000000000..c6ef12f9a08
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
@@ -0,0 +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</*0,r*/ A : java.io.Serializable>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
new file mode 100644
index 00000000000..78aea4bac30
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
@@ -0,0 +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</*0,r*/ A : java.io.Serializable & java.lang.Number>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
new file mode 100644
index 00000000000..6b104a8df3c
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
new file mode 100644
index 00000000000..69b5df0d7b0
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
@@ -0,0 +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</*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt b/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt
new file mode 100644
index 00000000000..ac6c373e15b
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt
@@ -0,0 +1,8 @@
+namespace test
+
+abstract class test.Aaa : jet.Any {
+    final /*constructor*/ fun <init>(): test.Aaa
+}
+final class test.Bbb : test.Aaa {
+    final /*constructor*/ fun <init>(): test.Bbb
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
new file mode 100644
index 00000000000..6603584e8d0
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
@@ -0,0 +1,8 @@
+namespace test
+
+abstract class test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.Aaa</*0,r*/ P : jet.Any?>
+}
+final class test.Bbb : test.Aaa<java.util.Random> {
+    final /*constructor*/ fun <init>(): test.Bbb
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
new file mode 100644
index 00000000000..9a9c58882c7
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
@@ -0,0 +1,7 @@
+namespace test
+
+abstract trait test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
+}
+final class test.Bbb : test.Aaa<java.util.Random> {
+    final /*constructor*/ fun <init>(): test.Bbb
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt b/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
new file mode 100644
index 00000000000..498372ec0f8
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
@@ -0,0 +1,8 @@
+namespace test
+
+final class test.Outer : jet.Any {
+    final /*constructor*/ fun <init>(): test.Outer
+    final class test.Outer.Inner : jet.Any {
+        final /*constructor*/ fun <init>(): test.Outer.Inner
+    }
+}
diff --git a/compiler/testData/readKotlinBinaryClass/class/Trait.txt b/compiler/testData/readKotlinBinaryClass/class/Trait.txt
new file mode 100644
index 00000000000..a7feba41b94
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/class/Trait.txt
@@ -0,0 +1,4 @@
+namespace test
+
+abstract trait test.Trtrtr : jet.Any {
+}
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
new file mode 100644
index 00000000000..3f0cb8dac8b
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
@@ -0,0 +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</*0,r*/ in T : jet.Any?>
+    final fun f(/*0*/ t: T): jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
new file mode 100644
index 00000000000..a4f8566cc48
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
@@ -0,0 +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</*0,r*/ T : jet.Any?>
+    final fun f(/*0*/ t: T): jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
new file mode 100644
index 00000000000..df7cca656c2
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
@@ -0,0 +1,10 @@
+namespace test
+
+final class test.Inh : test.Base<jet.String> {
+    final /*constructor*/ fun <init>(): test.Inh
+    final override /*1*/ fun foo(): jet.String
+}
+open class test.Base</*0,r*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Base</*0,r*/ T : jet.Any?>
+    final fun foo(): /*0,r*/ T : jet.Any?
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt
new file mode 100644
index 00000000000..3b49c0dd10f
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.ClassWithConstructor0 : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassWithConstructor0
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt
new file mode 100644
index 00000000000..d7ccb4a3cee
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt
@@ -0,0 +1,5 @@
+namespace test
+
+final class test.ClassWithConstructor1 : jet.Any {
+    final /*constructor*/ fun <init>(/*0*/ p: jet.Int): test.ClassWithConstructor1
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
new file mode 100644
index 00000000000..8a998f1cd1e
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
new file mode 100644
index 00000000000..a5d780ab595
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
new file mode 100644
index 00000000000..168a1716755
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
new file mode 100644
index 00000000000..ae18a907292
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
new file mode 100644
index 00000000000..b798a98d321
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?>
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
new file mode 100644
index 00000000000..28d8d3fbcb8
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
new file mode 100644
index 00000000000..064541d3ed7
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ in T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
new file mode 100644
index 00000000000..02e1cdaef8a
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ out T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
new file mode 100644
index 00000000000..57455bd84ae
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt
new file mode 100644
index 00000000000..20b314054f4
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
new file mode 100644
index 00000000000..5503cb1f6ac
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
new file mode 100644
index 00000000000..8c222f71a29
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ in P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
new file mode 100644
index 00000000000..0b94a70881c
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ A : java.lang.Number>uno(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
new file mode 100644
index 00000000000..49cd19332e0
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
new file mode 100644
index 00000000000..d744a1c098c
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ A : java.io.Serializable>dos(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
new file mode 100644
index 00000000000..13b23e030a4
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
new file mode 100644
index 00000000000..1ff6ab73562
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
new file mode 100644
index 00000000000..e06f5f48e62
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
new file mode 100644
index 00000000000..2183232bb5c
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun </*0,r*/ P : jet.Any?, /*1,r*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
new file mode 100644
index 00000000000..9dd5313d58c
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun ff(/*0*/ p: java.util.List<jet.CharSequence>): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
new file mode 100644
index 00000000000..8c3d10b1fec
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun ff(/*0*/ p: java.util.List<jet.CharSequence?>): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt
new file mode 100644
index 00000000000..a9d88b33a6d
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(/*0*/ a: java.lang.Integer?): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
new file mode 100644
index 00000000000..bf4260592c5
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun ffgg(): java.util.List<jet.CharSequence>
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
new file mode 100644
index 00000000000..6f3663aab16
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun ffgg(): java.util.List<jet.CharSequence?>
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
new file mode 100644
index 00000000000..026f790dd7f
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.River : jet.Any {
+    final /*constructor*/ fun <init>(): test.River
+    final fun song(): jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
new file mode 100644
index 00000000000..ca7cfc07bc7
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ClassFunGetFoo : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassFunGetFoo
+    final fun getFoo(): jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
new file mode 100644
index 00000000000..0f99c897718
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
@@ -0,0 +1,7 @@
+namespace test
+
+final class test.ClassFunGetFoo : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassFunGetFoo
+    final fun getFoo(): jet.Int
+    final fun setFoo(/*0*/ p: jet.Int): jet.Tuple0
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
new file mode 100644
index 00000000000..ef708fc5318
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ClassFunGetFoo : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassFunGetFoo
+    final fun set(/*0*/ p: jet.Int): jet.Tuple0
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt
new file mode 100644
index 00000000000..38ba1ac10d5
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun jet.Int.shuffle(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
new file mode 100644
index 00000000000..5dcea8467a7
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ExtFunInClass : jet.Any {
+    final /*constructor*/ fun <init>(): test.ExtFunInClass
+    final fun jet.Int.shuffle(): jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt
new file mode 100644
index 00000000000..6a1fc5da2ba
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun funDefaultArg(/*0*/ p: jet.Int, /*1*/ q: jet.Int = ?, /*2*/ r: jet.Int = ?): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt
new file mode 100644
index 00000000000..1088076267e
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(/*0*/ a: java.lang.Integer): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
new file mode 100644
index 00000000000..6742e75d737
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun varargInt(/*0*/ a: jet.Int, /*1*/ vararg b: jet.Int): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
new file mode 100644
index 00000000000..7777a8d1b19
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun varargCharSequence(/*0*/ a: jet.Int, /*1*/ vararg b: java.lang.Integer): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
new file mode 100644
index 00000000000..0591e678a20
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
@@ -0,0 +1,6 @@
+namespace test
+
+abstract class test.ModifierAbstract : jet.Any {
+    abstract fun abs(): jet.Int
+    final /*constructor*/ fun <init>(): test.ModifierAbstract
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
new file mode 100644
index 00000000000..a131a16e2b2
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
@@ -0,0 +1,6 @@
+namespace test
+
+open class test.ModifierOpen : jet.Any {
+    final /*constructor*/ fun <init>(): test.ModifierOpen
+    open fun abs(): jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt
new file mode 100644
index 00000000000..651faaf5645
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt
new file mode 100644
index 00000000000..b4cc8a16d87
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun getFoo(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt
new file mode 100644
index 00000000000..0c2b891746d
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun ff(): java.lang.Integer
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt
new file mode 100644
index 00000000000..a5282e19ace
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun ff(): java.lang.Integer?
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt b/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
new file mode 100644
index 00000000000..6253a150999
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ClassVal : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassVal
+    val aa: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt b/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
new file mode 100644
index 00000000000..325b86be770
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
@@ -0,0 +1,6 @@
+namespace test
+
+abstract class test.ClassValAbstract : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassValAbstract
+    val a: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt b/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
new file mode 100644
index 00000000000..5680f1edcea
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ClassVar : jet.Any {
+    final /*constructor*/ fun <init>(): test.ClassVar
+    var aa: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt b/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt
new file mode 100644
index 00000000000..6c611e4cf09
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt
@@ -0,0 +1,3 @@
+namespace test
+
+val java.util.Collection<out jet.Any?>.anotherSize: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
new file mode 100644
index 00000000000..916e57aa7fd
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
@@ -0,0 +1,3 @@
+namespace test
+
+val  </*0,r*/ P : jet.Any?> /*0,r*/ P : jet.Any?.anotherJavaClass: java.lang.Class</*0,r*/ P : jet.Any?>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
new file mode 100644
index 00000000000..4c39de69867
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ExtPropInClass : jet.Any {
+    final /*constructor*/ fun <init>(): test.ExtPropInClass
+    val jet.Int.itIs: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt
new file mode 100644
index 00000000000..330bd10ff17
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt
@@ -0,0 +1,3 @@
+namespace test
+
+val jet.Int.itIs: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt
new file mode 100644
index 00000000000..8ab25095ad1
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt
@@ -0,0 +1,3 @@
+namespace test
+
+val jet.Int.ggg: jet.CharSequence
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt
new file mode 100644
index 00000000000..d1ed8eb82bd
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+val jet.Int.ggg: jet.CharSequence?
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
new file mode 100644
index 00000000000..1ec615ac9c7
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ExtValInClass : jet.Any {
+    final /*constructor*/ fun <init>(): test.ExtValInClass
+    val jet.Int.asas: java.util.List<jet.Int>?
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
new file mode 100644
index 00000000000..851eda417c5
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
@@ -0,0 +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</*0,r*/ T : jet.Any?>
+    val jet.Int.asas: /*0,r*/ T : jet.Any?
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
new file mode 100644
index 00000000000..ddee10feee0
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+    val jet.Int.asas: /*0,r*/ P : jet.Any??
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
new file mode 100644
index 00000000000..3acbe403520
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+    val /*0,r*/ P : jet.Any?.asas: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
new file mode 100644
index 00000000000..687d1983dd5
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
@@ -0,0 +1,3 @@
+namespace test
+
+var  </*0,r*/ P : jet.Any?> /*0,r*/ P : jet.Any?.anotherJavaClass: java.lang.Class</*0,r*/ P : jet.Any?>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
new file mode 100644
index 00000000000..a04e425e951
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
@@ -0,0 +1,6 @@
+namespace test
+
+final class test.ExtPropInClass : jet.Any {
+    final /*constructor*/ fun <init>(): test.ExtPropInClass
+    var jet.Int.itIs: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt
new file mode 100644
index 00000000000..6e33f17cb56
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt
@@ -0,0 +1,3 @@
+namespace test
+
+var jet.Int.ggg: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
new file mode 100644
index 00000000000..36ae660f251
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+    var jet.Int.asas: /*0,r*/ P : jet.Any?
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
new file mode 100644
index 00000000000..e5054176d10
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+    var jet.Int.asas: /*0,r*/ P : jet.Any??
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
new file mode 100644
index 00000000000..d16a00ccc14
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
@@ -0,0 +1,3 @@
+namespace test
+
+var  </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> java.util.Map</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>.asas: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
new file mode 100644
index 00000000000..88d287059d8
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+    var /*0,r*/ P : jet.Any?.asas: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
new file mode 100644
index 00000000000..53f16265793
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
@@ -0,0 +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</*0,r*/ P : jet.Any?>
+    var /*0,r*/ P : jet.Any??.asas: jet.Int
+}
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
new file mode 100644
index 00000000000..bf7fe7873ac
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
@@ -0,0 +1,4 @@
+namespace test
+
+val jet.String.junk: jet.Int
+var jet.Int.junk: jet.Short
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt b/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt
new file mode 100644
index 00000000000..db2ff414658
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt
@@ -0,0 +1,3 @@
+namespace test
+
+val nsVal: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt b/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt
new file mode 100644
index 00000000000..5191d32f05f
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt
@@ -0,0 +1,3 @@
+namespace test
+
+var nsVal: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/type/Any.txt b/compiler/testData/readKotlinBinaryClass/type/Any.txt
new file mode 100644
index 00000000000..de4dee85d4b
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/Any.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun any(): jet.Any
diff --git a/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt b/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt
new file mode 100644
index 00000000000..f2ce12403f0
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun anyq(): jet.Any?
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt
new file mode 100644
index 00000000000..dae1696fc49
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): jet.Array<jet.Int>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt
new file mode 100644
index 00000000000..0d9ad43d29a
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun nothing(): jet.Array<java.lang.Integer>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt
new file mode 100644
index 00000000000..cf3e3847746
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): jet.Array<jet.String>
diff --git a/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt b/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt
new file mode 100644
index 00000000000..326dc4b7e9f
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fun1(): jet.Function1<jet.String, jet.Int>
diff --git a/compiler/testData/readKotlinBinaryClass/type/Int.txt b/compiler/testData/readKotlinBinaryClass/type/Int.txt
new file mode 100644
index 00000000000..be7b75cbd02
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/Int.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntArray.txt b/compiler/testData/readKotlinBinaryClass/type/IntArray.txt
new file mode 100644
index 00000000000..a9e83b08f1d
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/IntArray.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun nothing(): jet.IntArray
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntQ.txt b/compiler/testData/readKotlinBinaryClass/type/IntQ.txt
new file mode 100644
index 00000000000..fdee3bc8c01
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/IntQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): jet.Int?
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt
new file mode 100644
index 00000000000..7197d2c4b6d
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun listOfAny(): java.util.List<jet.Any>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt
new file mode 100644
index 00000000000..54256674661
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun listOfAnyQ(): java.util.List<jet.Any?>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt
new file mode 100644
index 00000000000..5301e8afa61
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun listOfStar(): java.util.List<out jet.Any?>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt
new file mode 100644
index 00000000000..74e684ab5a2
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): java.util.List<jet.String>
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt b/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt
new file mode 100644
index 00000000000..a9d3a359ec4
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun listOfJlString(): java.util.List<java.lang.String>
diff --git a/compiler/testData/readKotlinBinaryClass/type/Nothing.txt b/compiler/testData/readKotlinBinaryClass/type/Nothing.txt
new file mode 100644
index 00000000000..68e4a57943e
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/Nothing.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun nothing(): jet.Nothing
diff --git a/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt b/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt
new file mode 100644
index 00000000000..a13f80ff881
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun nothingq(): jet.Nothing?
diff --git a/compiler/testData/readKotlinBinaryClass/type/String.txt b/compiler/testData/readKotlinBinaryClass/type/String.txt
new file mode 100644
index 00000000000..de4ba4f553f
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/String.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): jet.String
diff --git a/compiler/testData/readKotlinBinaryClass/type/StringQ.txt b/compiler/testData/readKotlinBinaryClass/type/StringQ.txt
new file mode 100644
index 00000000000..2c80bcf9067
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/StringQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): jet.String?
diff --git a/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt b/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt
new file mode 100644
index 00000000000..f797b74576c
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun tuple0(): jet.Tuple0
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt b/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt
new file mode 100644
index 00000000000..dc82cd08541
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun integer(): java.lang.Integer
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt b/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt
new file mode 100644
index 00000000000..7e55758426a
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun integerq(): java.lang.Integer?
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObject.txt b/compiler/testData/readKotlinBinaryClass/type/jlObject.txt
new file mode 100644
index 00000000000..580d3e56183
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/jlObject.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun obj(): java.lang.Object
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt b/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt
new file mode 100644
index 00000000000..1abdceafd6d
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun objq(): java.lang.Object?
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlString.txt b/compiler/testData/readKotlinBinaryClass/type/jlString.txt
new file mode 100644
index 00000000000..09522174694
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/jlString.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): java.lang.String
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt b/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt
new file mode 100644
index 00000000000..eb737e3ef39
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt
@@ -0,0 +1,3 @@
+namespace test
+
+final fun fff(): java.lang.String?
diff --git a/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
index 6abd1bd31ce..f2f3c08fae8 100644
--- a/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/NamespaceComparator.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.compiler;
 
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Files;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.PropertyCodegen;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -41,9 +43,11 @@ import org.jetbrains.jet.lang.types.Variance;
 import org.junit.Assert;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Method;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -62,13 +66,28 @@ class NamespaceComparator {
         this.includeObject = includeObject;
     }
 
-    public static void compareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb, boolean includeObject) {
-        new NamespaceComparator(includeObject).doCompareNamespaces(nsa, nsb);
+    public static void compareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb, boolean includeObject,
+            @NotNull File txtFile) {
+        String serialized = new NamespaceComparator(includeObject).doCompareNamespaces(nsa, nsb);
+        try {
+            // change to true to regenerate files if format changes
+            if (false) {
+                Files.write(serialized, txtFile, Charset.forName("utf-8"));
+            } else {
+                String expected = Files.toString(txtFile, Charset.forName("utf-8"));
+                // compare with hardcopy: make sure nothing is lost in output
+                Assert.assertEquals(expected, serialized);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    private void doCompareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb) {
+    private String doCompareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb) {
+        StringBuilder sb = new StringBuilder();
         Assert.assertEquals(nsa.getName(), nsb.getName());
-        System.out.println("namespace " + nsa.getName());
+
+        sb.append("namespace " + nsa.getName() + "\n\n");
 
         Assert.assertTrue(!nsa.getMemberScope().getAllDescriptors().isEmpty());
 
@@ -93,13 +112,13 @@ class NamespaceComparator {
             ClassifierDescriptor cb = nsb.getMemberScope().getClassifier(name);
             Assert.assertTrue(ca != null);
             Assert.assertTrue(cb != null);
-            compareClassifiers(ca, cb);
+            compareClassifiers(ca, cb, sb);
         }
 
         for (String name : propertyNames) {
             Set<VariableDescriptor> pa = nsa.getMemberScope().getProperties(name);
             Set<VariableDescriptor> pb = nsb.getMemberScope().getProperties(name);
-            compareDeclarationSets(pa, pb);
+            compareDeclarationSets(pa, pb, sb);
 
             Assert.assertTrue(nsb.getMemberScope().getFunctions(PropertyCodegen.getterName(name)).isEmpty());
             Assert.assertTrue(nsb.getMemberScope().getFunctions(PropertyCodegen.setterName(name)).isEmpty());
@@ -108,15 +127,18 @@ class NamespaceComparator {
         for (String name : functionNames) {
             Set<FunctionDescriptor> fa = nsa.getMemberScope().getFunctions(name);
             Set<FunctionDescriptor> fb = nsb.getMemberScope().getFunctions(name);
-            compareDeclarationSets(fa, fb);
+            compareDeclarationSets(fa, fb, sb);
         }
+        
+        return sb.toString();
     }
 
-    private static void compareDeclarationSets(Set<? extends DeclarationDescriptor> a, Set<? extends DeclarationDescriptor> b) {
+    private static void compareDeclarationSets(Set<? extends DeclarationDescriptor> a, Set<? extends DeclarationDescriptor> b,
+            @NotNull StringBuilder sb) {
         String at = serializedDeclarationSets(a);
         String bt = serializedDeclarationSets(b);
         Assert.assertEquals(at, bt);
-        System.out.print(at);
+        sb.append(at);
     }
 
     private static String serializedDeclarationSets(Collection<? extends DeclarationDescriptor> ds) {
@@ -137,7 +159,7 @@ class NamespaceComparator {
         return r.toString();
     }
 
-    private void compareClassifiers(@NotNull ClassifierDescriptor a, @NotNull ClassifierDescriptor b) {
+    private void compareClassifiers(@NotNull ClassifierDescriptor a, @NotNull ClassifierDescriptor b, @NotNull StringBuilder sb) {
         StringBuilder sba = new StringBuilder();
         StringBuilder sbb = new StringBuilder();
 
@@ -148,23 +170,9 @@ class NamespaceComparator {
         String bs = sbb.toString();
 
         Assert.assertEquals(as, bs);
-        System.out.println(as);
+        sb.append(as);
     }
 
-    private void compareDescriptors(@NotNull DeclarationDescriptor a, @NotNull DeclarationDescriptor b) {
-        StringBuilder sba = new StringBuilder();
-        StringBuilder sbb = new StringBuilder();
-        new Serializer(sba).serialize(a);
-        new Serializer(sbb).serialize(b);
-
-        String as = sba.toString();
-        String bs = sbb.toString();
-
-        Assert.assertEquals(as, bs);
-        System.out.println(as);
-    }
-
-
 
 
     private static class Serializer {
diff --git a/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
index 218bbc5597c..092b95e27a7 100644
--- a/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/ReadJavaBinaryClassTest.java
@@ -56,11 +56,13 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir {
     
     private final File ktFile;
     private final File javaFile;
+    private final File txtFile;
 
     public ReadJavaBinaryClassTest(File ktFile) {
         this.ktFile = ktFile;
         Assert.assertTrue(ktFile.getName().endsWith(".kt"));
         this.javaFile = new File(ktFile.getPath().replaceFirst("\\.kt$", ".java"));
+        this.txtFile = new File(ktFile.getPath().replaceFirst("\\.kt$", ".txt"));
         setName(javaFile.getName());
     }
 
@@ -69,7 +71,7 @@ public class ReadJavaBinaryClassTest extends TestCaseWithTmpdir {
     public void runTest() throws Exception {
         NamespaceDescriptor nsa = compileKotlin();
         NamespaceDescriptor nsb = compileJava();
-        NamespaceComparator.compareNamespaces(nsa, nsb, false);
+        NamespaceComparator.compareNamespaces(nsa, nsb, false, txtFile);
     }
 
     private NamespaceDescriptor compileKotlin() throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
index 3ae33807185..9f6180041bd 100644
--- a/compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/compiler/ReadKotlinBinaryClassTest.java
@@ -52,9 +52,11 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir {
     private JetCoreEnvironment jetCoreEnvironment;
 
     private final File testFile;
+    private final File txtFile;
 
     public ReadKotlinBinaryClassTest(@NotNull File testFile) {
         this.testFile = testFile;
+        this.txtFile = new File(testFile.getPath().replaceFirst("\\.kt$", ".txt"));
         setName(testFile.getName());
     }
 
@@ -94,7 +96,7 @@ public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir {
         JavaDescriptorResolver javaDescriptorResolver = semanticServices.getDescriptorResolver();
         NamespaceDescriptor namespaceFromClass = javaDescriptorResolver.resolveNamespace("test");
         
-        NamespaceComparator.compareNamespaces(namespaceFromSource, namespaceFromClass, false);
+        NamespaceComparator.compareNamespaces(namespaceFromSource, namespaceFromClass, false, txtFile);
     }
 
     public static Test suite() {