Fix testdata after switching Kotlin to version 1.8
the corresponding features - GenericInlineClassParameter && DataObjects
- were turned on in 1.8 right after the last check build, therefore the
discrepancy went unnoticed
diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.kt b/compiler/testData/diagnostics/tests/dataClasses/strange.kt
index 0998adc..659a867 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/strange.kt
+++ b/compiler/testData/diagnostics/tests/dataClasses/strange.kt
@@ -3,7 +3,7 @@
B(2)
}
-<!UNSUPPORTED_FEATURE!>data<!> object Second
+data object Second
<!WRONG_MODIFIER_TARGET!>data<!> interface Third
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/inlineClassWithForbiddenUnderlyingType.kt b/compiler/testData/diagnostics/tests/inlineClasses/inlineClassWithForbiddenUnderlyingType.kt
index ae7a756..196e833 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/inlineClassWithForbiddenUnderlyingType.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/inlineClassWithForbiddenUnderlyingType.kt
@@ -1,11 +1,11 @@
// FIR_IDENTICAL
// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
-inline class Foo<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
-inline class FooNullable<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>)
+inline class Foo<T>(val x: T)
+inline class FooNullable<T>(val x: T?)
-inline class FooGenericArray<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<T><!>)
-inline class FooGenericArray2<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<Array<T>><!>)
+inline class FooGenericArray<T>(val x: Array<T>)
+inline class FooGenericArray2<T>(val x: Array<Array<T>>)
inline class FooStarProjectedArray(val x: Array<*>)
inline class FooStarProjectedArray2(val x: Array<Array<*>>)
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/recursiveInlineClasses.kt b/compiler/testData/diagnostics/tests/inlineClasses/recursiveInlineClasses.kt
index f2a05c8..8368691 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/recursiveInlineClasses.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/recursiveInlineClasses.kt
@@ -16,7 +16,7 @@
inline class TestRecursionInArray(val x: Array<TestRecursionInArray>)
-inline class TestRecursionInUpperBounds<T : TestRecursionInUpperBounds<T>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+inline class TestRecursionInUpperBounds<T : TestRecursionInUpperBounds<T>>(val x: T)
-inline class Id<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+inline class Id<T>(val x: T)
inline class TestRecursionThroughId(val x: Id<TestRecursionThroughId>)
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.kt b/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.kt
index 6f5b14d..284fbaa 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.kt
@@ -1,4 +1,4 @@
// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
// SKIP_TXT
-inline class ICAny<<!REIFIED_TYPE_PARAMETER_NO_INLINE, REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>(val value: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+inline class ICAny<<!REIFIED_TYPE_PARAMETER_NO_INLINE, REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>(val value: T)
diff --git a/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt b/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt
index 6d33765..c789ce4 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt
@@ -47,31 +47,31 @@
OPTIONAL_JVM_INLINE_ANNOTATION
-value class A5<T : A5<T>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class A5<T : A5<T>>(val x: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class B5<T : B5<T>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class B5<T : B5<T>>(val x: T, val y: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class A6<T : B6<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class A6<T : B6<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T, val y: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class B6<T : A6<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class B6<T : A6<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class A7<T : B7<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class A7<T : B7<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T, val y: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class B7<T : A7<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class B7<T : A7<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T, val y: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class A8<T : B8<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>)
+value class A8<T : B8<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T?, val y: T?)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class B8<T : A8<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>)
+value class B8<T : A8<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T?, val y: T?)
interface I1
interface I2
@@ -86,9 +86,9 @@
val t6: Int,
val t7: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B<!>,
val t8: String,
- val t9: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>,
+ val t9: T,
val t10: Char,
- val t11: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>,
+ val t11: T?,
) where T : I1, T : B?, T : I2
OPTIONAL_JVM_INLINE_ANNOTATION
diff --git a/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt b/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt
index 019e85c..f62eaf3 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt
@@ -31,9 +31,9 @@
value class TestRecursionInArray(val x: Array<TestRecursionInArray>)
@JvmInline
-value class TestRecursionInUpperBounds<T : TestRecursionInUpperBounds<T>>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class TestRecursionInUpperBounds<T : TestRecursionInUpperBounds<T>>(val x: T)
@JvmInline
-value class Id<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class Id<T>(val x: T)
@JvmInline
value class TestRecursionThroughId(val x: Id<TestRecursionThroughId>)
diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt
index 57f7ba8..e3027f4 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt
@@ -7,14 +7,14 @@
annotation class JvmInline
@JvmInline
-value class Foo<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class Foo<T>(val x: T)
@JvmInline
-value class FooNullable<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>)
+value class FooNullable<T>(val x: T?)
@JvmInline
-value class FooGenericArray<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<T><!>)
+value class FooGenericArray<T>(val x: Array<T>)
@JvmInline
-value class FooGenericArray2<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<Array<T>><!>)
+value class FooGenericArray2<T>(val x: Array<Array<T>>)
@JvmInline
value class FooStarProjectedArray(val x: Array<*>)
diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt
index ff57e0d..13b9571 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt
@@ -9,17 +9,17 @@
OPTIONAL_JVM_INLINE_ANNOTATION
-value class Foo<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T<!>)
+value class Foo<T>(val x: T, val y: T)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class FooNullable<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>T?<!>)
+value class FooNullable<T>(val x: T?, val y: T?)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class FooGenericArray<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<T><!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<T><!>)
+value class FooGenericArray<T>(val x: Array<T>, val y: Array<T>)
OPTIONAL_JVM_INLINE_ANNOTATION
-value class FooGenericArray2<T>(val x: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<Array<T>><!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Array<Array<T>><!>)
+value class FooGenericArray2<T>(val x: Array<Array<T>>, val y: Array<Array<T>>)
OPTIONAL_JVM_INLINE_ANNOTATION
