From 22f8b9f475b40964b79b201f3a756fdb74936061 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 27 Aug 2019 11:01:08 +0200 Subject: [PATCH] Remove codegen tests on inline classes based on type parameters According to KT-23819, such inline classes are prohibited. These tests can be restored (and fixed if needed) as soon as we allow this back --- ...ericInlineClassWithDefaultTypeParameter.kt | 44 ------------------- ...ericInlineClassWithNotNullTypeParameter.kt | 31 ------------- .../ir/IrWriteSignatureTestGenerated.java | 10 ----- .../compiler/WriteSignatureTestGenerated.java | 10 ----- 4 files changed, 95 deletions(-) delete mode 100644 compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt delete mode 100644 compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt diff --git a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt b/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt deleted file mode 100644 index 95519d2fa1b..00000000000 --- a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt +++ /dev/null @@ -1,44 +0,0 @@ -// !LANGUAGE: +InlineClasses - -@Suppress("INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE") -inline class Default(val x: T) - -class Inv - -object Test { - fun withNotNullPrimitive(a: Default) {} - fun withAdditionalGenericParameter(x: Inv, y: Default) {} - - fun asNullable(a: Default?) {} - - fun asNullableTypeArgument(a: Default) {} - fun asNullableAndNullableTypeArgument(a: Default?) {} -} - -// method: Test::withNotNullPrimitive-jBNXRxo -// jvm signature: (I)V -// generic signature: null - -// method: Test::withAdditionalGenericParameter-HGK7qdE -// jvm signature: (LInv;Ljava/lang/String;)V -// generic signature: (LInv;Ljava/lang/String;)V - -// method: Test::asNullable-wrrn6tY -// jvm signature: (LDefault;)V -// generic signature: (LDefault;)V - -// method: Test::asNullableTypeArgument-jBNXRxo -// jvm signature: (Ljava/lang/Integer;)V -// generic signature: null - -// method: Test::asNullableAndNullableTypeArgument-wrrn6tY -// jvm signature: (LDefault;)V -// generic signature: (LDefault;)V - -// method: Default:box -// jvm signature: (Ljava/lang/Object;)LDefault; -// generic signature: null - -// method: Default:unbox -// jvm signature: ()Ljava/lang/Object -// generic signature: null diff --git a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt b/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt deleted file mode 100644 index a8a2b736bd7..00000000000 --- a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt +++ /dev/null @@ -1,31 +0,0 @@ -// !LANGUAGE: +InlineClasses - -@Suppress("INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE") -inline class NonNull(val x: T) - -@Suppress("INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE") -inline class NullableValue(val x: T?) - -object Test { - fun withNotNullPrimitive(a: NonNull) {} - fun asNullable(a: NonNull?) {} - - fun withNotNullForNullableValue(a: NullableValue) {} - fun asNullableForNullableValue(a: NullableValue?) {} -} - -// method: Test::withNotNullPrimitive-inxE8tU -// jvm signature: (I)V -// generic signature: null - -// method: Test::asNullable-UczwCtY -// jvm signature: (LNonNull;)V -// generic signature: (LNonNull;)V - -// method: Test::withNotNullForNullableValue-3nNnbBk -// jvm signature: (Ljava/lang/Integer;)V -// generic signature: null - -// method: Test::asNullableForNullableValue-wXDnar0 -// jvm signature: (LNullableValue;)V -// generic signature: (LNullableValue;)V diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteSignatureTestGenerated.java index 6661d9fdb84..51972ca49f0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteSignatureTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrWriteSignatureTestGenerated.java @@ -532,16 +532,6 @@ public class IrWriteSignatureTestGenerated extends AbstractIrWriteSignatureTest runTest("compiler/testData/writeSignature/inlineClasses/genericInlineClassBasedOnGenericType.kt"); } - @TestMetadata("genericInlineClassWithDefaultTypeParameter.kt") - public void testGenericInlineClassWithDefaultTypeParameter() throws Exception { - runTest("compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt"); - } - - @TestMetadata("genericInlineClassWithNotNullTypeParameter.kt") - public void testGenericInlineClassWithNotNullTypeParameter() throws Exception { - runTest("compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt"); - } - @TestMetadata("genericMethodInsideClass.kt") public void testGenericMethodInsideClass() throws Exception { runTest("compiler/testData/writeSignature/inlineClasses/genericMethodInsideClass.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java index 13381b4acb3..ffa83efdf97 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java @@ -532,16 +532,6 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { runTest("compiler/testData/writeSignature/inlineClasses/genericInlineClassBasedOnGenericType.kt"); } - @TestMetadata("genericInlineClassWithDefaultTypeParameter.kt") - public void testGenericInlineClassWithDefaultTypeParameter() throws Exception { - runTest("compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt"); - } - - @TestMetadata("genericInlineClassWithNotNullTypeParameter.kt") - public void testGenericInlineClassWithNotNullTypeParameter() throws Exception { - runTest("compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt"); - } - @TestMetadata("genericMethodInsideClass.kt") public void testGenericMethodInsideClass() throws Exception { runTest("compiler/testData/writeSignature/inlineClasses/genericMethodInsideClass.kt");