From 854127bcc8f51a49c61a0c022d0c5abf4fbdf3f9 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 1 Jul 2022 12:18:48 +0200 Subject: [PATCH] Fix testdata after switching Kotlin to version 1.8 (see the previous commit with the same title for details) --- .../resolve/inlineClasses/inlineClassConstructor.kt | 4 ++-- .../diagnostics/tests/dataClasses/strange.fir.kt | 10 ---------- .../testData/diagnostics/tests/dataClasses/strange.kt | 1 + .../inlineClasses/reifiedGenericUnderlyingType.fir.kt | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/strange.fir.kt diff --git a/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassConstructor.kt b/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassConstructor.kt index a1e0e9c80c0..23a90bf68af 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassConstructor.kt +++ b/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassConstructor.kt @@ -11,8 +11,8 @@ inline class SimpleParameter(Unit) inline class NothingParameter(val x: Nothing) -inline class TypeParameterType(val x: T) -inline class ArrayOfTypeParameters(val x: Array) +inline class TypeParameterType(val x: T) +inline class ArrayOfTypeParameters(val x: Array) inline class ListOfTypeParameters(val x: List) inline class StarProjection(val x: Array<*>) diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.fir.kt b/compiler/testData/diagnostics/tests/dataClasses/strange.fir.kt deleted file mode 100644 index d6157a34a9c..00000000000 --- a/compiler/testData/diagnostics/tests/dataClasses/strange.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -data enum class First(val x: Int) { - A(1), - B(2) -} - -data object Second - -data interface Third - -data annotation class Fourth(val x: Int) diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.kt b/compiler/testData/diagnostics/tests/dataClasses/strange.kt index 659a8674019..7cea5809fd6 100644 --- a/compiler/testData/diagnostics/tests/dataClasses/strange.kt +++ b/compiler/testData/diagnostics/tests/dataClasses/strange.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL data enum class First(val x: Int) { A(1), B(2) diff --git a/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.fir.kt index 4716f4c4645..3a5a382adec 100644 --- a/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.fir.kt +++ b/compiler/testData/diagnostics/tests/inlineClasses/reifiedGenericUnderlyingType.fir.kt @@ -1,4 +1,4 @@ // !LANGUAGE: +InlineClasses, -JvmInlineValueClasses // SKIP_TXT -inline class ICAny<reified T>(val value: T) +inline class ICAny<reified T>(val value: T)