Merge remote branch 'origin/master'

compiler/testData/readClass/class/ClassParamReferencesParam.kt

@@ -0,0 +1,3 @@
+package test
+
+class ClassParamReferencesParam<A, B : A>

compiler/testData/readClass/class/ClassParamReferencesParam2.kt

@@ -0,0 +1,3 @@
+package test
+
+class ClassParamReferencesParam<A, in B : A>

compiler/testData/readClass/class/ClassTwoParams.kt

@@ -0,0 +1,3 @@
+package test
+
+class ClassTwoParams<P, Q>

compiler/testData/readClass/class/ClassTwoParams2.kt

@@ -0,0 +1,3 @@
+package test
+
+class ClassTwoParams<out P, Q>

compiler/testData/readClass/classFun/ClassInParamUsedInFun.kt

@@ -0,0 +1,5 @@
+package test
+
+class ClassParamUsedInFun<in T> {
+    fun f(t: T) = 1
+}

compiler/testData/readClass/classFun/ClassParamUsedInFun.kt

@@ -0,0 +1,5 @@
+package test
+
+class ClassParamUsedInFun<T> {
+    fun f(t: T) = 1
+}

compiler/testData/readClass/fun/genericWithTypeVariables/FunParamParam.kt

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

compiler/testData/readClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt

@@ -0,0 +1,3 @@
+package test
+
+fun <P, Q : P> funParamReferencesParam() = 1

compiler/testData/readClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt

@@ -0,0 +1,3 @@
+package test
+
+fun <in P, Q : P> funParamReferencesParam() = 1

compiler/testData/readClass/fun/genericWithTypeVariables/FunParamVaragParam.kt

@@ -0,0 +1,3 @@
+package test
+
+fun <P> funParamVarargParam(a: Int, vararg b: P) = 1

compiler/testData/readClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt

@@ -0,0 +1,3 @@
+package test
+
+fun <P, Q> funTwoTypeParams() = 1

compiler/testData/readClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt

@@ -0,0 +1,3 @@
+package test
+
+fun <P, in Q> funTwoTypeParams() = 1