From 8158dd0c838ada321fed72e226cc2a2fbc89b135 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 6 Sep 2018 17:03:30 +0300 Subject: [PATCH] Update testData for writeSignature tests --- .../basicInlineClassDeclarationCodegen.kt | 10 +++++----- .../genericInlineClassBasedOnGenericType.kt | 10 +++++----- .../genericInlineClassWithDefaultTypeParameter.kt | 12 ++++++------ .../genericInlineClassWithNotNullTypeParameter.kt | 8 ++++---- .../inlineClassBasedOnOtherInlineClass.kt | 2 +- .../inlineClassWithComplexSubstitutedType.kt | 12 ++++++------ .../inlineClasses/nullableInlineClassType.kt | 8 ++++---- ...simpleSignatureWithInlineClassTypesAsPrimitive.kt | 6 +++--- ...simpleSignatureWithInlineClassTypesAsReference.kt | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/compiler/testData/writeSignature/inlineClasses/basicInlineClassDeclarationCodegen.kt b/compiler/testData/writeSignature/inlineClasses/basicInlineClassDeclarationCodegen.kt index d4e656fe02f..bc9c47ab0a0 100644 --- a/compiler/testData/writeSignature/inlineClasses/basicInlineClassDeclarationCodegen.kt +++ b/compiler/testData/writeSignature/inlineClasses/basicInlineClassDeclarationCodegen.kt @@ -9,22 +9,22 @@ inline class Foo(val x: Int) { fun withInlineClassType(c: Foo) {} } -// method: Foo$Erased::empty +// method: Foo::empty-impl // jvm signature: (I)V // generic signature: null -// method: Foo$Erased::param +// method: Foo::param-impl // jvm signature: (ILjava/lang/String;)V // generic signature: null -// method: Foo$Erased::extension +// method: Foo::extension-impl // jvm signature: (ILjava/lang/Object;)V // generic signature: null -// method: Foo$Erased::extensionAndParam +// method: Foo::extensionAndParam-impl // jvm signature: (ILjava/lang/Object;D)V // generic signature: null -// method: Foo$Erased::withInlineClassType-1e4ch6lh +// method: Foo::withInlineClassType-GWb7d6U // jvm signature: (II)V // generic signature: null diff --git a/compiler/testData/writeSignature/inlineClasses/genericInlineClassBasedOnGenericType.kt b/compiler/testData/writeSignature/inlineClasses/genericInlineClassBasedOnGenericType.kt index ebbc9be7059..435fbb8e119 100644 --- a/compiler/testData/writeSignature/inlineClasses/genericInlineClassBasedOnGenericType.kt +++ b/compiler/testData/writeSignature/inlineClasses/genericInlineClassBasedOnGenericType.kt @@ -9,22 +9,22 @@ object Test { fun nullableValue(f: Foo?) {} } -// method: Test::nonNullTypeArgument-1e4ch6lh +// method: Test::nonNullTypeArgument-GWb7d6U // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List;)V -// method: Test::nullableTypeArgument-1e4ch6lh +// method: Test::nullableTypeArgument-GWb7d6U // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List;)V -// method: Test::nullableValue-31ee2c96 +// method: Test::nullableValue-N3I3QIo // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List;)V -// method: Foo$Erased::box +// method: Foo::box-impl // jvm signature: (Ljava/util/List;)LFoo; // generic signature: null -// method: Foo::unbox +// method: Foo::unbox-impl // jvm signature: ()Ljava/util/List; // generic signature: ()Ljava/util/List; diff --git a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt b/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt index e8e9583b672..d4ad56c262b 100644 --- a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt +++ b/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithDefaultTypeParameter.kt @@ -15,27 +15,27 @@ object Test { fun asNullableAndNullableTypeArgument(a: Default?) {} } -// method: Test::withNotNullPrimitive-7odoyk9m +// method: Test::withNotNullPrimitive-jBNXRxo // jvm signature: (Ljava/lang/Object;)V // generic signature: null -// method: Test::withAdditionalGenericParameter-1k09dck1 +// method: Test::withAdditionalGenericParameter-HGK7qdE // jvm signature: (LInv;Ljava/lang/Object;)V // generic signature: (LInv;Ljava/lang/Object;)V -// method: Test::asNullable-ao7usvyu +// method: Test::asNullable-wrrn6tY // jvm signature: (LDefault;)V // generic signature: (LDefault;)V -// method: Test::asNullableTypeArgument-7odoyk9m +// method: Test::asNullableTypeArgument-jBNXRxo // jvm signature: (Ljava/lang/Object;)V // generic signature: null -// method: Test::asNullableAndNullableTypeArgument-ao7usvyu +// method: Test::asNullableAndNullableTypeArgument-wrrn6tY // jvm signature: (LDefault;)V // generic signature: (LDefault;)V -// method: Default$Erased:box +// method: Default:box // jvm signature: (Ljava/lang/Object;)LDefault; // generic signature: null diff --git a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt b/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt index e796ab098b1..0c15ceb4d73 100644 --- a/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt +++ b/compiler/testData/writeSignature/inlineClasses/genericInlineClassWithNotNullTypeParameter.kt @@ -14,18 +14,18 @@ object Test { fun asNullableForNullableValue(a: NullableValue?) {} } -// method: Test::withNotNullPrimitive-7l8qu2mt +// method: Test::withNotNullPrimitive-inxE8tU // jvm signature: (Ljava/lang/Object;)V // generic signature: null -// method: Test::asNullable-4hed6sie +// method: Test::asNullable-UczwCtY // jvm signature: (Ljava/lang/Object;)V // generic signature: null -// method: Test::withNotNullForNullableValue-c6wvqrdl +// method: Test::withNotNullForNullableValue-3nNnbBk // jvm signature: (Ljava/lang/Object;)V // generic signature: null -// method: Test::asNullableForNullableValue-aloai6d9 +// method: Test::asNullableForNullableValue-wXDnar0 // jvm signature: (LNullableValue;)V // generic signature: (LNullableValue;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/inlineClasses/inlineClassBasedOnOtherInlineClass.kt b/compiler/testData/writeSignature/inlineClasses/inlineClassBasedOnOtherInlineClass.kt index fd00daff46b..1b3bd35c246 100644 --- a/compiler/testData/writeSignature/inlineClasses/inlineClassBasedOnOtherInlineClass.kt +++ b/compiler/testData/writeSignature/inlineClasses/inlineClassBasedOnOtherInlineClass.kt @@ -8,7 +8,7 @@ object Test { fun listOfFoo(f: List) {} } -// method: Test::simple-1e4ch6lh +// method: Test::simple-GWb7d6U // jvm signature: (I)V // generic signature: null diff --git a/compiler/testData/writeSignature/inlineClasses/inlineClassWithComplexSubstitutedType.kt b/compiler/testData/writeSignature/inlineClasses/inlineClassWithComplexSubstitutedType.kt index 6c082ed3ba5..6b6e0ce5d16 100644 --- a/compiler/testData/writeSignature/inlineClasses/inlineClassWithComplexSubstitutedType.kt +++ b/compiler/testData/writeSignature/inlineClasses/inlineClassWithComplexSubstitutedType.kt @@ -16,26 +16,26 @@ object Test { fun withInnerGenericInlineClassIn(a: AsCmp>>) {} } -// method: Test::withInlineClassArgumentOut-5xv5g663 +// method: Test::withInlineClassArgumentOut-bGQ91Ds // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List;)V -// method: Test::withInlineClassArgumentIn-brqdr5wn +// method: Test::withInlineClassArgumentIn-1sHIm6c // jvm signature: (Ljava/lang/Comparable;)V // generic signature: (Ljava/lang/Comparable<-LUInt;>;)V -// method: Test::withListOfInlineClassArgument-5xv5g663 +// method: Test::withListOfInlineClassArgument-bGQ91Ds // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List<+Ljava/util/List;>;)V -// method: Test::withComparableOfInlineClassArgument-brqdr5wn +// method: Test::withComparableOfInlineClassArgument-1sHIm6c // jvm signature: (Ljava/lang/Comparable;)V // generic signature: (Ljava/lang/Comparable<-Ljava/lang/Comparable<-LUInt;>;>;)V -// method: Test::withInnerGenericInlineClassOut-5xv5g663 +// method: Test::withInnerGenericInlineClassOut-bGQ91Ds // jvm signature: (Ljava/util/List;)V // generic signature: (Ljava/util/List;>;>;)V -// method: Test::withInnerGenericInlineClassIn-brqdr5wn +// method: Test::withInnerGenericInlineClassIn-1sHIm6c // jvm signature: (Ljava/lang/Comparable;)V // generic signature: (Ljava/lang/Comparable<-LAsCmp;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/inlineClasses/nullableInlineClassType.kt b/compiler/testData/writeSignature/inlineClasses/nullableInlineClassType.kt index e64624e2af4..9ea32e26d34 100644 --- a/compiler/testData/writeSignature/inlineClasses/nullableInlineClassType.kt +++ b/compiler/testData/writeSignature/inlineClasses/nullableInlineClassType.kt @@ -13,18 +13,18 @@ object Test { fun withNullableReferenceAsNullable(a: InlineNullableReference?) {} } -// method: Test::withPrimitiveAsNullable-arwt9fzf +// method: Test::withPrimitiveAsNullable-xJoXpis // jvm signature: (LInlinePrimitive;)V // generic signature: null -// method: Test::withReferenceAsNullable-8k1ogbuu +// method: Test::withReferenceAsNullable-nB_snAY // jvm signature: (Ljava/lang/String;)V // generic signature: null -// method: Test::withNullablePrimitiveAsNullable-aiqm4cvc +// method: Test::withNullablePrimitiveAsNullable-v_QJOCg // jvm signature: (LInlineNullablePrimitive;)V // generic signature: null -// method: Test::withNullableReferenceAsNullable-7pmrpo2y +// method: Test::withNullableReferenceAsNullable-jLXMqSo // jvm signature: (LInlineNullableReference;)V // generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt b/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt index f7a29b03bc1..b2c67c501d7 100644 --- a/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt +++ b/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsPrimitive.kt @@ -9,7 +9,7 @@ object Test { fun Foo.asAll(x: Any?, a: Foo, b: Int): Foo = TODO() } -// method: Test::asParam-1e4ch6lh +// method: Test::asParam-GWb7d6U // jvm signature: (I)V // generic signature: null @@ -17,10 +17,10 @@ object Test { // jvm signature: ()I // generic signature: null -// method: Test::asExtension-1e4ch6lh +// method: Test::asExtension-GWb7d6U // jvm signature: (I)V // generic signature: null -// method: Test::asAll-dmjdpekg +// method: Test::asAll--J2ODwA // jvm signature: (ILjava/lang/Object;II)I // generic signature: null diff --git a/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsReference.kt b/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsReference.kt index 8454113c006..511aab6907f 100644 --- a/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsReference.kt +++ b/compiler/testData/writeSignature/inlineClasses/simpleSignatureWithInlineClassTypesAsReference.kt @@ -10,7 +10,7 @@ object Test { fun asReturn(): Bar = TODO() } -// method: Test::asParam-1e4ch6lh +// method: Test::asParam-GWb7d6U // jvm signature: (Ljava/lang/Integer;)V // generic signature: null