From 5cb7cf040a90b9481e5726b5b9878172eef4d6d7 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 20 Jan 2020 11:13:41 +0300 Subject: [PATCH] Update some testdata according switching compiler to 1.4 --- .../testData/cli/jvm/apiVersionInvalid.out | 2 +- .../cli/jvm/languageVersionInvalid.out | 2 +- ...localReturnInsidePropertyAccessor.fir.fail | 2 +- .../.idea/kotlinc.xml | 4 +- .../testData/codegen/Basic.txt | 46 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index 0a4a7e92e9c..d34ed0e0413 100644 --- a/compiler/testData/cli/jvm/apiVersionInvalid.out +++ b/compiler/testData/cli/jvm/apiVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown API version: 239.42 -Supported API versions: 1.0, 1.1, 1.2, 1.3, 1.4 (EXPERIMENTAL) +Supported API versions: 1.0, 1.1, 1.2, 1.3, 1.4 COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index fc29ba865f2..89c42a9061c 100644 --- a/compiler/testData/cli/jvm/languageVersionInvalid.out +++ b/compiler/testData/cli/jvm/languageVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown language version: 239.42 -Supported language versions: 1.0, 1.1, 1.2, 1.3, 1.4 (EXPERIMENTAL) +Supported language versions: 1.0, 1.1, 1.2, 1.3, 1.4 COMPILATION_ERROR diff --git a/compiler/testData/diagnostics/tests/controlStructures/localReturnInsidePropertyAccessor.fir.fail b/compiler/testData/diagnostics/tests/controlStructures/localReturnInsidePropertyAccessor.fir.fail index d552b3e6439..08fa1008153 100644 --- a/compiler/testData/diagnostics/tests/controlStructures/localReturnInsidePropertyAccessor.fir.fail +++ b/compiler/testData/diagnostics/tests/controlStructures/localReturnInsidePropertyAccessor.fir.fail @@ -1,2 +1,2 @@ Failures detected in FirImplicitTypeBodyResolveTransformerAdapter, file: /localReturnInsidePropertyAccessor.fir.kt -Cause: kotlin.KotlinNullPointerException +Cause: java.lang.NullPointerException diff --git a/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml b/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml index 87001db3a02..7b71b3b10b4 100644 --- a/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml +++ b/idea/testData/configuration/dropKotlincOnVersionAutoAdvance/.idea/kotlinc.xml @@ -1,7 +1,7 @@ - \ No newline at end of file diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt index 86b97bfe516..3ab0a27403b 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt @@ -57,7 +57,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L0) ALOAD (1) LDC (decoder) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) ASTORE (2) ICONST_0 @@ -160,10 +160,10 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L0) ALOAD (1) LDC (encoder) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (obj) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) ASTORE (3) ALOAD (1) @@ -235,7 +235,7 @@ public final class ListOfUsers : java/lang/Object { LABEL (L0) ALOAD (1) LDC (list) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) LINENUMBER (13) ALOAD (0) @@ -275,13 +275,13 @@ public final class ListOfUsers : java/lang/Object { LABEL (L0) ALOAD (0) LDC (self) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (1) LDC (output) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (serialDesc) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (1) ALOAD (2) ICONST_0 @@ -354,7 +354,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L0) ALOAD (1) LDC (decoder) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) ASTORE (2) ICONST_0 @@ -451,10 +451,10 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L0) ALOAD (1) LDC (encoder) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (obj) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) ASTORE (3) ALOAD (1) @@ -526,7 +526,7 @@ public final class OptionalUser : java/lang/Object { LABEL (L0) ALOAD (1) LDC (user) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) LINENUMBER (10) ALOAD (0) @@ -600,13 +600,13 @@ public final class OptionalUser : java/lang/Object { LABEL (L0) ALOAD (0) LDC (self) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (1) LDC (output) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (serialDesc) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (0) GETFIELD (user, LUser;) LABEL (L1) @@ -705,7 +705,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L0) ALOAD (1) LDC (decoder) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) ASTORE (2) ICONST_0 @@ -806,10 +806,10 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L0) ALOAD (1) LDC (encoder) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (obj) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) ASTORE (3) ALOAD (1) @@ -883,10 +883,10 @@ public final class User : java/lang/Object { LABEL (L0) ALOAD (1) LDC (firstName) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (lastName) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) LABEL (L1) LINENUMBER (7) ALOAD (0) @@ -945,13 +945,13 @@ public final class User : java/lang/Object { LABEL (L0) ALOAD (0) LDC (self) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (1) LDC (output) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (2) LDC (serialDesc) - INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkParameterIsNotNull, (Ljava/lang/Object;Ljava/lang/String;)V) + INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) ALOAD (1) ALOAD (2) ICONST_0 @@ -967,4 +967,4 @@ public final class User : java/lang/Object { RETURN LABEL (L1) } -} +} \ No newline at end of file