From 16d1e85932a86e2ee7a915654c8f31efe4a9bb30 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 23 Nov 2023 23:00:58 +0100 Subject: [PATCH] IR text tests: Stable blank lines between declarations in class Rework rendering of kt-like dump and signatures dump in order to avoid unstable blank line between declarations of the same level: 1. No blank line for the first declaration inside the member scope of the class. 2. Always a single blank line between each two subsequent declarations inside the member scope of the class. --- .../kotlin/ir/util/dumpKotlinLike.kt | 15 +++++-- .../testData/ir/irText/classes/47424.kt.txt | 5 --- .../ir/irText/classes/47424.sig.kt.txt | 7 ---- .../irText/classes/abstractMembers.sig.kt.txt | 1 - ...ringInDelegatingConstructorCall.sig.kt.txt | 1 + .../ir/irText/classes/classMembers.sig.kt.txt | 2 +- .../ir/irText/classes/classes.fir.kt.txt | 1 - .../testData/ir/irText/classes/classes.kt.txt | 1 - .../ir/irText/classes/classes.sig.kt.txt | 2 +- .../ir/irText/classes/cloneable.kt.txt | 1 - .../ir/irText/classes/cloneable.sig.kt.txt | 2 + .../dataClassWithArrayMembers.sig.kt.txt | 3 ++ .../dataClasses/dataClasses.sig.kt.txt | 3 ++ .../dataClasses/dataClassesGeneric.sig.kt.txt | 4 ++ .../classes/dataClasses/dataObject.sig.kt.txt | 1 + .../dataClasses/delegationInSealed.sig.kt.txt | 1 + .../classes/dataClasses/kt31649.sig.kt.txt | 2 + .../classes/dataClasses/kt49936.sig.kt.txt | 1 + ...mbdaInDataClassDefaultParameter.sig.kt.txt | 2 + .../dataClasses/openDataClass.sig.kt.txt | 1 + .../classes/declarationOrder.sig.kt.txt | 3 ++ .../delegatedImplementation.sig.kt.txt | 4 +- ...lementationWithExplicitOverride.sig.kt.txt | 2 +- ...torCallsInSecondaryConstructors.sig.kt.txt | 2 + .../ir/irText/classes/enum.sig.kt.txt | 9 ++++ .../classes/enumClassModality.sig.kt.txt | 12 +++++- .../ir/irText/classes/enumEntries.fir.ir.txt | 2 - .../ir/irText/classes/enumEntries.fir.kt.txt | 1 - .../ir/irText/classes/enumEntries.ir.txt | 2 - .../testData/ir/irText/classes/enumEntries.kt | 3 -- .../ir/irText/classes/enumEntries.kt.txt | 1 - .../ir/irText/classes/enumEntries.sig.kt.txt | 42 ++++++++++++++++++- .../classes/enumWithMultipleCtors.sig.kt.txt | 4 ++ .../classes/enumWithSecondaryCtor.sig.kt.txt | 8 ++++ ...otNullOnDelegatedImplementation.sig.kt.txt | 6 ++- .../ir/irText/classes/inlineClass.sig.kt.txt | 1 + .../inlineClassSyntheticMethods.sig.kt.txt | 1 + ...rClassWithDelegatingConstructor.sig.kt.txt | 1 + .../objectLiteralExpressions.sig.kt.txt | 1 - ...tructorWithSuperConstructorCall.sig.kt.txt | 1 + .../classes/privateInterface.sig.kt.txt | 3 +- .../classes/qualifiedSuperCalls.sig.kt.txt | 2 - ...orWithInitializersFromClassBody.sig.kt.txt | 2 + .../classes/secondaryConstructors.sig.kt.txt | 1 + .../classes/superCallsComposed.sig.kt.txt | 1 - .../classesWithAnnotations.fir.kt.txt | 1 - .../annotations/classesWithAnnotations.kt.txt | 1 - .../classesWithAnnotations.sig.kt.txt | 2 +- .../constructorsWithAnnotations.sig.kt.txt | 1 + .../enumsInAnnotationArguments.sig.kt.txt | 1 + .../genericAnnotationClasses.fir.kt.txt | 1 - .../genericAnnotationClasses.kt.txt | 1 - .../genericAnnotationClasses.sig.kt.txt | 1 - .../inheritingDeprecation.sig.kt.txt | 1 - .../arrayAccessCompositeOperators.sig.kt.txt | 1 + .../arrayAccessOperators.sig.kt.txt | 1 + .../compoundAssignmentOperators.sig.kt.txt | 1 + .../fromKEEP/canvas.sig.kt.txt | 2 - .../fromKEEP/compareTo.sig.kt.txt | 1 + .../fromKEEP/monoidSum.sig.kt.txt | 1 - .../iteratorOperator.sig.kt.txt | 2 + .../declarations/contextReceivers/lazy.kt.txt | 1 - .../contextReceivers/lazy.sig.kt.txt | 1 - .../contextReceivers/plusMatrix.sig.kt.txt | 1 - .../contextReceivers/property.sig.kt.txt | 2 - .../unaryOperators.sig.kt.txt | 1 + .../delegationEvaluationOrder1.sig.kt.txt | 3 +- .../delegationEvaluationOrder2.sig.kt.txt | 5 ++- .../declarations/fakeOverrides.sig.kt.txt | 2 - .../inlineCollectionOfInlineClass.sig.kt.txt | 2 + .../interfaceProperties.sig.kt.txt | 1 - .../dataClassWithJvmRecord.sig.kt.txt | 1 + .../ir/irText/declarations/kt35550.sig.kt.txt | 1 - .../ir/irText/declarations/kt52677.kt.txt | 1 - .../ir/irText/declarations/kt52677.sig.kt.txt | 2 +- .../multiplatform/expectClassInherited.kt.txt | 2 + .../expectIntersectionOverride.sig.kt.txt | 2 - .../expectMemberInNotExpectClass.kt.txt | 1 + .../expectedEnumClass.sig.kt.txt | 1 + .../expectedEnumClass2.sig.kt.txt | 1 + .../declarations/parameters/class.kt.txt | 1 - .../declarations/parameters/class.sig.kt.txt | 1 - .../parameters/constructor.sig.kt.txt | 2 + .../parameters/dataClassMembers.sig.kt.txt | 1 + .../parameters/delegatedMembers.sig.kt.txt | 2 +- .../ir/irText/declarations/typeAlias.kt.txt | 1 - .../arrayAugmentedAssignment2.sig.kt.txt | 2 - .../caoWithAdaptationForSam.fir.kt.txt | 1 - .../caoWithAdaptationForSam.kt.txt | 1 - .../caoWithAdaptationForSam.sig.kt.txt | 2 - .../withAdaptationForSam.sig.kt.txt | 1 - ...ndConversionForSimpleExpression.sig.kt.txt | 1 - .../conventionComparisons.fir.kt.txt | 1 - .../expressions/conventionComparisons.kt.txt | 1 - .../conventionComparisons.sig.kt.txt | 2 - .../enumEntryAsReceiver.sig.kt.txt | 2 + .../exhaustiveWhenElseBranch.sig.kt.txt | 1 + .../forWithImplicitReceivers.sig.kt.txt | 1 - ...rrayAsVarargAfterSamArgument_fi.sig.kt.txt | 1 - .../basicFunInterfaceConversion.sig.kt.txt | 1 - .../funInterface/castFromAny.sig.kt.txt | 1 - .../funInterface/functionSupertype.kt.txt | 1 - .../funInterface/functionSupertype.sig.kt.txt | 1 - .../funInterface/partialSam.sig.kt.txt | 1 - .../samConversionInVarargs.sig.kt.txt | 1 - .../samConversionInVarargsMixed.sig.kt.txt | 1 - ...amConversionOnCallableReference.sig.kt.txt | 1 - .../samConversionsWithSmartCasts.fir.kt.txt | 1 - .../samConversionsWithSmartCasts.kt.txt | 1 - .../samConversionsWithSmartCasts.sig.kt.txt | 2 - ...unInterfaceConstructorReference.sig.kt.txt | 3 -- ...icitCastInReturnFromConstructor.sig.kt.txt | 1 + .../implicitCastToTypeParameter.fir.kt.txt | 1 - .../implicitCastToTypeParameter.kt.txt | 1 - .../implicitCastToTypeParameter.sig.kt.txt | 1 - .../expressions/interfaceThisRef.sig.kt.txt | 1 - ...dReferenceWithIntersectionTypes.fir.kt.txt | 1 - ...FieldReferenceWithIntersectionTypes.kt.txt | 1 - ...dReferenceWithIntersectionTypes.sig.kt.txt | 1 - .../ir/irText/expressions/kt30020.sig.kt.txt | 2 +- .../ir/irText/expressions/kt35730.sig.kt.txt | 1 - .../ir/irText/expressions/kt47082.kt.txt | 3 -- .../ir/irText/expressions/kt47082.sig.kt.txt | 3 -- .../ir/irText/expressions/kt47328.sig.kt.txt | 1 - .../expressions/multipleSmartCasts.sig.kt.txt | 2 - .../expressions/objectAsCallable.sig.kt.txt | 1 + .../irText/expressions/safeCalls.sig.kt.txt | 1 - .../expressions/smartCastAside.sig.kt.txt | 3 -- .../expressions/smartCastAside2.sig.kt.txt | 1 - .../smartCastsWithDestructuring.fir.kt.txt | 2 - .../smartCastsWithDestructuring.kt.txt | 2 - .../smartCastsWithDestructuring.sig.kt.txt | 2 - ...pendConversionWithFunInterfaces.sig.kt.txt | 1 - ...temporaryInEnumEntryInitializer.sig.kt.txt | 1 + .../irText/expressions/typeOperators.kt.txt | 1 - .../expressions/typeOperators.sig.kt.txt | 1 - .../expressions/useImportedMember.sig.kt.txt | 1 - .../ir/irText/expressions/values.sig.kt.txt | 1 + .../whenSmartCastToEnum.sig.kt.txt | 1 + .../firProblems/AnnotationLoader.sig.kt.txt | 1 - .../AnonymousAsReturnOfGenericFunction.kt.txt | 1 - ...nymousAsReturnOfGenericFunction.sig.kt.txt | 1 - .../ir/irText/firProblems/ArrayMap.sig.kt.txt | 2 + .../ClashResolutionDescriptor.fir.kt.txt | 3 -- .../ClashResolutionDescriptor.kt.txt | 3 -- .../ClashResolutionDescriptor.sig.kt.txt | 3 -- .../firProblems/DeepCopyIrTree.fir.kt.txt | 3 -- .../irText/firProblems/DeepCopyIrTree.kt.txt | 3 -- .../firProblems/DeepCopyIrTree.sig.kt.txt | 6 --- ...elegationAndInheritanceFromJava.sig.kt.txt | 1 + .../ErrorInDefaultValue.sig.kt.txt | 2 +- ...errideInAnonymousWithDelegation.sig.kt.txt | 1 - .../Fir2IrClassifierStorage.sig.kt.txt | 1 - .../ImplicitReceiverStack.fir.kt.txt | 2 - .../firProblems/ImplicitReceiverStack.kt.txt | 2 - .../ImplicitReceiverStack.sig.kt.txt | 3 -- .../ir/irText/firProblems/Modality.kt.txt | 1 - .../ir/irText/firProblems/Modality.sig.kt.txt | 1 - .../irText/firProblems/MultiList.fir.kt.txt | 1 - .../ir/irText/firProblems/MultiList.kt.txt | 1 - .../firProblems/SignatureClash.fir.kt.txt | 2 - .../irText/firProblems/SignatureClash.kt.txt | 2 - .../firProblems/SignatureClash.sig.kt.txt | 3 +- .../firProblems/SimpleTypeMarker.kt.txt | 1 - .../firProblems/SimpleTypeMarker.sig.kt.txt | 2 - .../firProblems/TypeParameterBounds.kt.txt | 2 - .../TypeParameterBounds.sig.kt.txt | 2 - .../firProblems/candidateSymbol.fir.kt.txt | 1 - .../irText/firProblems/candidateSymbol.kt.txt | 1 - .../firProblems/candidateSymbol.sig.kt.txt | 3 -- .../ir/irText/firProblems/kt43342.sig.kt.txt | 2 + .../ir/irText/firProblems/kt59102.sig.kt.txt | 1 + ...ambdaInEnumEntryConstructorCall.sig.kt.txt | 1 + ...CapturedTypeInPropertyReference.fir.kt.txt | 1 - ...siveCapturedTypeInPropertyReference.kt.txt | 1 - ...CapturedTypeInPropertyReference.sig.kt.txt | 2 - ...otationOnDefaultMethodParameter.sig.kt.txt | 1 - ...ubstitutionOverrideWithDelegate.fir.kt.txt | 1 - .../substitutionOverrideWithDelegate.kt.txt | 1 - .../thisInEnumConstructor.sig.kt.txt | 1 + .../firProblems/valueClassEquals.sig.kt.txt | 1 + .../js/dynamic/dynamicInDataClass.sig.kt.txt | 1 + .../ir/irText/js/external/kt38765.fir.kt.txt | 2 +- .../ir/irText/js/external/kt38765.kt.txt | 3 +- .../ir/irText/js/external/kt38765.sig.kt.txt | 2 +- .../js/native/nativeNativeKotlin.kt.txt | 2 + .../js/native/nativeNativeKotlin.sig.kt.txt | 1 + .../lambdas/destructuringInLambda.sig.kt.txt | 1 + .../multipleImplicitReceivers.sig.kt.txt | 2 - .../regressions/integerCoercionToT.kt.txt | 1 - .../regressions/integerCoercionToT.sig.kt.txt | 1 - .../ir/irText/regressions/kt45236.sig.kt.txt | 1 + .../newInferenceFixationOrder1.kt.txt | 1 - .../newInferenceFixationOrder1.sig.kt.txt | 1 - .../ir/irText/singletons/enumEntry.sig.kt.txt | 2 + .../ir/irText/stubs/javaInnerClass.sig.kt.txt | 1 + .../castsInsideCoroutineInference.fir.kt.txt | 2 - .../castsInsideCoroutineInference.kt.txt | 2 - .../castsInsideCoroutineInference.sig.kt.txt | 6 --- .../definitelyNonNullOverride.sig.kt.txt | 1 + .../types/definitelyNonNullSAM.sig.kt.txt | 3 -- .../definitelyNonNullWithJava.sig.kt.txt | 1 - .../definitelyNotNullAsArgument.sig.kt.txt | 1 - .../genericDelegatedDeepProperty.sig.kt.txt | 3 -- .../types/genericFunWithStar.fir.kt.txt | 4 -- .../ir/irText/types/genericFunWithStar.kt.txt | 4 -- .../types/genericFunWithStar.sig.kt.txt | 4 -- .../inStarProjectionInReceiverType.sig.kt.txt | 1 - .../ir/irText/types/intersectionType2.kt.txt | 2 - .../irText/types/intersectionType2.sig.kt.txt | 2 - .../ir/irText/types/intersectionType3.kt.txt | 7 ---- .../irText/types/intersectionType3.sig.kt.txt | 7 ---- .../intersectionTypeInSamType.sig.kt.txt | 7 ---- .../irText/types/javaWildcardType.sig.kt.txt | 2 +- .../localVariableOfIntersectionType.kt.txt | 1 - ...localVariableOfIntersectionType.sig.kt.txt | 5 --- .../enhancedNullabilityInForLoop.sig.kt.txt | 2 +- .../nullCheckOnInterfaceDelegation.sig.kt.txt | 2 +- .../receiverOfIntersectionType.fir.kt.txt | 2 - .../types/receiverOfIntersectionType.kt.txt | 2 - .../receiverOfIntersectionType.sig.kt.txt | 3 -- .../ir/irText/types/starProjection.kt.txt | 1 - .../ir/irText/types/starProjection.sig.kt.txt | 1 - .../typeAliasWithUnsafeVariance.sig.kt.txt | 1 + .../klib/KlibIrTextTestCaseGenerated.java | 5 +++ .../FirLightTreeJsIrTextTestGenerated.java | 6 +++ .../test/fir/FirPsiJsIrTextTestGenerated.java | 6 +++ .../test/ir/ClassicJsIrTextTestGenerated.java | 6 +++ .../ClassicNativeIrTextTestGenerated.java | 6 +++ ...FirLightTreeNativeIrTextTestGenerated.java | 6 +++ .../FirPsiNativeIrTextTestGenerated.java | 6 +++ 231 files changed, 236 insertions(+), 280 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt index 0c00bfb6727..babcfe8308b 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt @@ -607,9 +607,9 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption "fun ", declaration.name.asString(), printTypeParametersAndExtensionReceiver = true, - printSignatureAndBody = true + printSignatureAndBody = true, + printExtraTrailingNewLine = true, ) - p.printlnWithNoIndent() } override fun visitConstructor(declaration: IrConstructor, data: IrDeclaration?) = wrap(declaration, data) { @@ -647,6 +647,7 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption it.accept(this, declaration) } p.printlnWithNoIndent() + p.printlnWithNoIndent() } private fun IrSimpleFunction.printSimpleFunction( @@ -654,7 +655,8 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption keyword: String, name: String, printTypeParametersAndExtensionReceiver: Boolean, - printSignatureAndBody: Boolean + printSignatureAndBody: Boolean, + printExtraTrailingNewLine: Boolean ) { /* TODO correspondingProperty @@ -720,6 +722,9 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption if (!printSignatureAndBody || body == null || options.bodyPrintingStrategy != BodyPrintingStrategy.PRINT_BODIES) { p.printlnWithNoIndent() } + + if (printExtraTrailingNewLine) + p.printlnWithNoIndent() } } @@ -876,6 +881,7 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption name = s, printTypeParametersAndExtensionReceiver = false, printSignatureAndBody = isDefaultAccessor, + printExtraTrailingNewLine = false, ) } @@ -1220,7 +1226,8 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption "fun ", expression.function.name.asString(), printTypeParametersAndExtensionReceiver = true, - printSignatureAndBody = true + printSignatureAndBody = true, + printExtraTrailingNewLine = false, ) } diff --git a/compiler/testData/ir/irText/classes/47424.kt.txt b/compiler/testData/ir/irText/classes/47424.kt.txt index f167f1009c1..93851e6ddd2 100644 --- a/compiler/testData/ir/irText/classes/47424.kt.txt +++ b/compiler/testData/ir/irText/classes/47424.kt.txt @@ -1,19 +1,15 @@ package com.example interface Aa { - } interface Ab> : Aa { - } interface Ba { - } interface Bb> : Ab, Ba { - } interface Ca { @@ -29,5 +25,4 @@ interface Cb { } interface C : Cb, Ca { - } diff --git a/compiler/testData/ir/irText/classes/47424.sig.kt.txt b/compiler/testData/ir/irText/classes/47424.sig.kt.txt index 07b7ae4fec6..bb1f39b8872 100644 --- a/compiler/testData/ir/irText/classes/47424.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/47424.sig.kt.txt @@ -4,35 +4,30 @@ package com.example // Mangled name: com.example.Aa // Public signature: com.example/Aa|null[0] interface Aa { - } // CHECK: // Mangled name: com.example.Ab // Public signature: com.example/Ab|null[0] interface Ab> : Aa { - } // CHECK: // Mangled name: com.example.Ba // Public signature: com.example/Ba|null[0] interface Ba { - } // CHECK: // Mangled name: com.example.Bb // Public signature: com.example/Bb|null[0] interface Bb> : Ab, Ba { - } // CHECK: // Mangled name: com.example.C // Public signature: com.example/C|null[0] interface C : Ca, Cb { - // CHECK: // Mangled name: com.example.C{}b // Public signature: com.example/C.b|772347207915745207[0] @@ -54,7 +49,6 @@ interface C : Ca, Cb { // Mangled name: com.example.Ca // Public signature: com.example/Ca|null[0] interface Ca { - // CHECK: // Mangled name: com.example.Ca{}b // Public signature: com.example/Ca.b|772347207915745207[0] @@ -76,7 +70,6 @@ interface Ca { // Mangled name: com.example.Cb // Public signature: com.example/Cb|null[0] interface Cb { - // CHECK: // Mangled name: com.example.Cb{}b // Public signature: com.example/Cb.b|772347207915745207[0] diff --git a/compiler/testData/ir/irText/classes/abstractMembers.sig.kt.txt b/compiler/testData/ir/irText/classes/abstractMembers.sig.kt.txt index bd5a017befb..5709cedfde0 100644 --- a/compiler/testData/ir/irText/classes/abstractMembers.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/abstractMembers.sig.kt.txt @@ -55,7 +55,6 @@ abstract class AbstractClass { // Mangled name: Interface // Public signature: /Interface|null[0] interface Interface { - // CHECK: // Mangled name: Interface#abstractFun(){} // Public signature: /Interface.abstractFun|-8137574360252002020[0] diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.sig.kt.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.sig.kt.txt index 52c752783dd..8527b89b587 100644 --- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.sig.kt.txt @@ -91,6 +91,7 @@ class Test2 : Base { // Public signature: /Test2.|-7691762014320324121[0] // Public signature debug description: (kotlin.Int;kotlin.Int){} constructor(xx: Int, yy: Int) + // CHECK: // Mangled name: Test2#(kotlin.Int;kotlin.Int;kotlin.Any){} // Public signature: /Test2.|-2775945437722696135[0] diff --git a/compiler/testData/ir/irText/classes/classMembers.sig.kt.txt b/compiler/testData/ir/irText/classes/classMembers.sig.kt.txt index e38abc6e82e..97d39cd3f30 100644 --- a/compiler/testData/ir/irText/classes/classMembers.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/classMembers.sig.kt.txt @@ -80,7 +80,6 @@ class C { // Mangled name: C.NestedInterface // Public signature: /C.NestedInterface|null[0] interface NestedInterface { - // CHECK: // Mangled name: C.NestedInterface#bar(){} // Public signature: /C.NestedInterface.bar|496682602797471549[0] @@ -112,6 +111,7 @@ class C { // Public signature: /C.|-5645683436151566731[0] // Public signature debug description: (){} constructor() + // CHECK: // Mangled name: C#(kotlin.Int;kotlin.Int;kotlin.Int){} // Public signature: /C.|3555954663887180339[0] diff --git a/compiler/testData/ir/irText/classes/classes.fir.kt.txt b/compiler/testData/ir/irText/classes/classes.fir.kt.txt index 93b202fb336..95a536a69e0 100644 --- a/compiler/testData/ir/irText/classes/classes.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/classes.fir.kt.txt @@ -8,7 +8,6 @@ class TestClass { } interface TestInterface { - } object TestObject { diff --git a/compiler/testData/ir/irText/classes/classes.kt.txt b/compiler/testData/ir/irText/classes/classes.kt.txt index 93b202fb336..95a536a69e0 100644 --- a/compiler/testData/ir/irText/classes/classes.kt.txt +++ b/compiler/testData/ir/irText/classes/classes.kt.txt @@ -8,7 +8,6 @@ class TestClass { } interface TestInterface { - } object TestObject { diff --git a/compiler/testData/ir/irText/classes/classes.sig.kt.txt b/compiler/testData/ir/irText/classes/classes.sig.kt.txt index 6056dee9490..ba574a813a1 100644 --- a/compiler/testData/ir/irText/classes/classes.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/classes.sig.kt.txt @@ -31,6 +31,7 @@ enum class TestEnumClass : Enum { // Public signature: /TestEnumClass.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestEnumClass#valueOf#static(kotlin.String){}TestEnumClass // Public signature: /TestEnumClass.valueOf|3258702714702284561[0] @@ -142,7 +143,6 @@ enum class TestEnumClass : Enum { // Mangled name: TestInterface // Public signature: /TestInterface|null[0] interface TestInterface { - } // CHECK: diff --git a/compiler/testData/ir/irText/classes/cloneable.kt.txt b/compiler/testData/ir/irText/classes/cloneable.kt.txt index d5d61aabac7..d08b7dff5d3 100644 --- a/compiler/testData/ir/irText/classes/cloneable.kt.txt +++ b/compiler/testData/ir/irText/classes/cloneable.kt.txt @@ -8,7 +8,6 @@ class A : Cloneable { } interface I : Cloneable { - } class C : I { diff --git a/compiler/testData/ir/irText/classes/cloneable.sig.kt.txt b/compiler/testData/ir/irText/classes/cloneable.sig.kt.txt index b426fff105d..881da8fe296 100644 --- a/compiler/testData/ir/irText/classes/cloneable.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/cloneable.sig.kt.txt @@ -7,6 +7,7 @@ class A : Cloneable { // Public signature: /A.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: A#clone(){}kotlin.Any // Public signature: /A.clone|-6903128697527593263[0] @@ -27,6 +28,7 @@ class C : I { // Public signature: /C.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: C#clone(){}kotlin.Any // Public signature: /C.clone|-6903128697527593263[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.sig.kt.txt index 4b5f4068708..dffb762a879 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.sig.kt.txt @@ -142,6 +142,7 @@ data class Test1 { // Public signature: /Test1.|-2901047261480922149[0] // Public signature debug description: (kotlin.Array;kotlin.CharArray;kotlin.BooleanArray;kotlin.ByteArray;kotlin.ShortArray;kotlin.IntArray;kotlin.LongArray;kotlin.FloatArray;kotlin.DoubleArray){} constructor(stringArray: Array, charArray: CharArray, booleanArray: BooleanArray, byteArray: ByteArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray) /* primary */ + // CHECK JVM_IR: // Mangled name: Test1#component1(){}kotlin.Array // Public signature: /Test1.component1|2673462985803256369[0] @@ -298,6 +299,7 @@ data class Test2 { // Public signature: /Test2.|-6569388914691766420[0] // Public signature debug description: (kotlin.Array<1:0>){} constructor(genericArray: Array) /* primary */ + // CHECK JVM_IR: // Mangled name: Test2#component1(){}kotlin.Array<1:0> // Public signature: /Test2.component1|-8550302254215159930[0] @@ -374,6 +376,7 @@ data class Test3 { // Public signature: /Test3.|2034455610636948474[0] // Public signature debug description: (kotlin.Array?){} constructor(anyArrayN: Array?) /* primary */ + // CHECK JVM_IR: // Mangled name: Test3#component1(){}kotlin.Array? // Public signature: /Test3.component1|3443609172722853741[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClasses.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClasses.sig.kt.txt index e05dd99b8ff..3838ec0646b 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClasses.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClasses.sig.kt.txt @@ -52,6 +52,7 @@ data class Test1 { // Public signature: /Test1.|3237794121889594884[0] // Public signature debug description: (kotlin.Int;kotlin.String;kotlin.Any){} constructor(x: Int, y: String, z: Any) /* primary */ + // CHECK JVM_IR: // Mangled name: Test1#component1(){}kotlin.Int // Public signature: /Test1.component1|-8217597213800111288[0] @@ -148,6 +149,7 @@ data class Test2 { // Public signature: /Test2.|-8205545948568413246[0] // Public signature debug description: (kotlin.Any?){} constructor(x: Any?) /* primary */ + // CHECK JVM_IR: // Mangled name: Test2#component1(){}kotlin.Any? // Public signature: /Test2.component1|-9062417290864755441[0] @@ -269,6 +271,7 @@ data class Test3 { // Public signature: /Test3.|8878758829470622568[0] // Public signature debug description: (kotlin.Double;kotlin.Double?;kotlin.Float;kotlin.Float?){} constructor(d: Double, dn: Double?, f: Float, df: Float?) /* primary */ + // CHECK JVM_IR: // Mangled name: Test3#component1(){}kotlin.Double // Public signature: /Test3.component1|2948120330742694173[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.sig.kt.txt index 993ec252c74..bc90f9e6d0e 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.sig.kt.txt @@ -22,6 +22,7 @@ data class Test1 { // Public signature: /Test1.|-8731461708390519279[0] // Public signature debug description: (1:0){} constructor(x: T) /* primary */ + // CHECK JVM_IR: // Mangled name: Test1#component1(){}1:0 // Public signature: /Test1.component1|2393470133763651536[0] @@ -98,6 +99,7 @@ data class Test2 { // Public signature: /Test2.|-8731461708390519279[0] // Public signature debug description: (1:0){} constructor(x: T) /* primary */ + // CHECK JVM_IR: // Mangled name: Test2#component1(){}1:0 // Public signature: /Test2.component1|2393470133763651536[0] @@ -174,6 +176,7 @@ data class Test3 { // Public signature: /Test3.|-6703374673612964420[0] // Public signature debug description: (kotlin.collections.List<1:0>){} constructor(x: List) /* primary */ + // CHECK JVM_IR: // Mangled name: Test3#component1(){}kotlin.collections.List<1:0> // Public signature: /Test3.component1|-4141154284195946749[0] @@ -250,6 +253,7 @@ data class Test4 { // Public signature: /Test4.|-9211757031347255021[0] // Public signature debug description: (kotlin.collections.List){} constructor(x: List) /* primary */ + // CHECK JVM_IR: // Mangled name: Test4#component1(){}kotlin.collections.List // Public signature: /Test4.component1|-4918334505452908017[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataObject.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataObject.sig.kt.txt index 732ab13e07d..b5ae23b7b7c 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataObject.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataObject.sig.kt.txt @@ -7,6 +7,7 @@ data object DataObject { // Public signature: /DataObject.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: DataObject#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /DataObject.equals|722809408929142791[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.sig.kt.txt index 50b0d404097..f33d10fbc61 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.sig.kt.txt @@ -26,6 +26,7 @@ sealed class A : CharSequence { // Public signature: /A.B.|2804354480087813081[0] // Public signature debug description: (kotlin.CharSequence){} constructor(c: CharSequence) /* primary */ + // CHECK JVM_IR: // Mangled name: A.B#get(kotlin.Int){}kotlin.Char // Public signature: /A.B.get|6519934306502810002[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/kt31649.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/kt31649.sig.kt.txt index c70e6f8fa26..ed7f0a206be 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/kt31649.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/kt31649.sig.kt.txt @@ -22,6 +22,7 @@ data class TestData { // Public signature: /TestData.|-7885966204384349687[0] // Public signature debug description: (kotlin.Nothing?){} constructor(nn: Nothing?) /* primary */ + // CHECK JVM_IR: // Mangled name: TestData#component1(){}kotlin.Nothing? // Public signature: /TestData.component1|137173073680766068[0] @@ -98,6 +99,7 @@ value class TestInline { // Public signature: /TestInline.|-7885966204384349687[0] // Public signature debug description: (kotlin.Nothing?){} constructor(nn: Nothing?) /* primary */ + // CHECK JVM_IR: // Mangled name: TestInline#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /TestInline.equals|722809408929142791[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/kt49936.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/kt49936.sig.kt.txt index 2639dbedd20..100251495a9 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/kt49936.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/kt49936.sig.kt.txt @@ -22,6 +22,7 @@ data class A { // Public signature: /A.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(x: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: A#component1(){}kotlin.Int // Public signature: /A.component1|-8217597213800111288[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.sig.kt.txt index a4685aaad4a..ee90ec43fef 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.sig.kt.txt @@ -22,6 +22,7 @@ data class A { // Public signature: /A.|-2423641970729475329[0] // Public signature debug description: (kotlin.Function2){} constructor(runA: @ExtensionFunctionType Function2) /* primary */ + // CHECK JVM_IR: // Mangled name: A#component1(){}kotlin.Function2 // Public signature: /A.component1|793860828130635274[0] @@ -98,6 +99,7 @@ data class B { // Public signature: /B.|4518179880532599055[0] // Public signature debug description: (kotlin.Any){} constructor(x: Any) /* primary */ + // CHECK JVM_IR: // Mangled name: B#component1(){}kotlin.Any // Public signature: /B.component1|2325042746135573536[0] diff --git a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.sig.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.sig.kt.txt index c757f18a845..d8cfe8bfa9f 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.sig.kt.txt @@ -37,6 +37,7 @@ open data class ValidatedProperties { // Public signature: /ValidatedProperties.|9140439783797628932[0] // Public signature debug description: (kotlin.String;kotlin.String){} constructor(test1: String, test2: String) /* primary */ + // CHECK JVM_IR: // Mangled name: ValidatedProperties#component1(){}kotlin.String // Public signature: /ValidatedProperties.component1|-7481405593404337796[0] diff --git a/compiler/testData/ir/irText/classes/declarationOrder.sig.kt.txt b/compiler/testData/ir/irText/classes/declarationOrder.sig.kt.txt index 38b01ae762d..ded7681c8f4 100644 --- a/compiler/testData/ir/irText/classes/declarationOrder.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/declarationOrder.sig.kt.txt @@ -39,16 +39,19 @@ class A { // Public signature: test/A.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK: // Mangled name: test.A#(kotlin.Double){} // Public signature: test/A.|575075696928934302[0] // Public signature debug description: (kotlin.Double){} constructor(x: Double) + // CHECK: // Mangled name: test.A#(kotlin.Int){} // Public signature: test/A.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(x: Int) + // CHECK: // Mangled name: test.A#(kotlin.String){} // Public signature: test/A.|1280618353163213788[0] diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.sig.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.sig.kt.txt index 42ffe43336a..61e585387a2 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.sig.kt.txt @@ -7,6 +7,7 @@ class Test1 : IBase { // Public signature: /Test1.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: Test1#bar(){}kotlin.Int // Public signature: /Test1.bar|-6436649210114349217[0] @@ -40,6 +41,7 @@ class Test2 : IBase, IOther { // Public signature: /Test2.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: Test2#bar(){}kotlin.Int // Public signature: /Test2.bar|-6436649210114349217[0] @@ -138,7 +140,6 @@ class Test2 : IBase, IOther { // Mangled name: IBase // Public signature: /IBase|null[0] interface IBase { - // CHECK JVM_IR: // Mangled name: IBase#bar(){}kotlin.Int // Public signature: /IBase.bar|-6436649210114349217[0] @@ -167,7 +168,6 @@ interface IBase { // Mangled name: IOther // Public signature: /IOther|null[0] interface IOther { - // CHECK: // Mangled name: IOther{}x // Public signature: /IOther.x|-8060530855978347579[0] diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.sig.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.sig.kt.txt index 83a47d1bf2c..676a7ed82f5 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.sig.kt.txt @@ -7,6 +7,7 @@ class C : IFooBar { // Public signature: /C.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK: // Mangled name: C#foo(){} // Public signature: /C.foo|-1041209573719867811[0] @@ -25,7 +26,6 @@ class C : IFooBar { // Mangled name: IFooBar // Public signature: /IFooBar|null[0] interface IFooBar { - // CHECK: // Mangled name: IFooBar#bar(){} // Public signature: /IFooBar.bar|496682602797471549[0] diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.sig.kt.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.sig.kt.txt index 8089abac1fd..79148974a68 100644 --- a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.sig.kt.txt @@ -19,11 +19,13 @@ class Test : Base { // Public signature: /Test.|-5645683436151566731[0] // Public signature debug description: (){} constructor() + // CHECK: // Mangled name: Test#(kotlin.Int){} // Public signature: /Test.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(xx: Int) + // CHECK: // Mangled name: Test#(kotlin.Short){} // Public signature: /Test.|-8537285994488541433[0] diff --git a/compiler/testData/ir/irText/classes/enum.sig.kt.txt b/compiler/testData/ir/irText/classes/enum.sig.kt.txt index 4e2bcbbe6fc..b2b56ac3628 100644 --- a/compiler/testData/ir/irText/classes/enum.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/enum.sig.kt.txt @@ -7,6 +7,7 @@ enum class TestEnum1 : Enum { // Public signature: /TestEnum1.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestEnum1.TEST1 // Public signature: /TestEnum1.TEST1|null[0] @@ -148,6 +149,7 @@ enum class TestEnum2 : Enum { // Public signature: /TestEnum2.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: TestEnum2.TEST1 // Public signature: /TestEnum2.TEST1|null[0] @@ -279,6 +281,7 @@ abstract enum class TestEnum3 : Enum { // Public signature: /TestEnum3.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestEnum3.TEST // Public signature: /TestEnum3.TEST|null[0] @@ -293,6 +296,7 @@ abstract enum class TestEnum3 : Enum { // Public signature: /TestEnum3.TEST..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestEnum3.TEST#compareTo(TestEnum3){}kotlin.Int // Public signature: /TestEnum3.TEST..compareTo|3758334100252612666[0] @@ -508,6 +512,7 @@ abstract enum class TestEnum4 : Enum { // Public signature: /TestEnum4.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: TestEnum4.TEST1 // Public signature: /TestEnum4.TEST1|null[0] @@ -522,6 +527,7 @@ abstract enum class TestEnum4 : Enum { // Public signature: /TestEnum4.TEST1..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestEnum4.TEST1#compareTo(TestEnum4){}kotlin.Int // Public signature: /TestEnum4.TEST1..compareTo|-8388826051358644820[0] @@ -644,6 +650,7 @@ abstract enum class TestEnum4 : Enum { // Public signature: /TestEnum4.TEST2..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestEnum4.TEST2#compareTo(TestEnum4){}kotlin.Int // Public signature: /TestEnum4.TEST2..compareTo|-8388826051358644820[0] @@ -874,6 +881,7 @@ enum class TestEnum5 : Enum { // Public signature: /TestEnum5.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: TestEnum5.TEST1 // Public signature: /TestEnum5.TEST1|null[0] @@ -1035,6 +1043,7 @@ enum class TestEnum6 : Enum { // Public signature: /TestEnum6.|-7691762014320324121[0] // Public signature debug description: (kotlin.Int;kotlin.Int){} private constructor(x: Int, y: Int) /* primary */ + // CHECK: // Mangled name: TestEnum6.TEST // Public signature: /TestEnum6.TEST|null[0] diff --git a/compiler/testData/ir/irText/classes/enumClassModality.sig.kt.txt b/compiler/testData/ir/irText/classes/enumClassModality.sig.kt.txt index 388a89a6254..c3cdc05dcf1 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.sig.kt.txt @@ -7,6 +7,7 @@ abstract enum class TestAbstractEnum1 : Enum { // Public signature: /TestAbstractEnum1.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestAbstractEnum1.X1 // Public signature: /TestAbstractEnum1.X1|null[0] @@ -21,6 +22,7 @@ abstract enum class TestAbstractEnum1 : Enum { // Public signature: /TestAbstractEnum1.X1..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestAbstractEnum1.X1#compareTo(TestAbstractEnum1){}kotlin.Int // Public signature: /TestAbstractEnum1.X1..compareTo|4568850831400093628[0] @@ -221,6 +223,7 @@ abstract enum class TestAbstractEnum2 : Enum, IFoo { // Public signature: /TestAbstractEnum2.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestAbstractEnum2.X1 // Public signature: /TestAbstractEnum2.X1|null[0] @@ -235,6 +238,7 @@ abstract enum class TestAbstractEnum2 : Enum, IFoo { // Public signature: /TestAbstractEnum2.X1..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestAbstractEnum2.X1#compareTo(TestAbstractEnum2){}kotlin.Int // Public signature: /TestAbstractEnum2.X1..compareTo|1400147308358154853[0] @@ -435,6 +439,7 @@ enum class TestFinalEnum1 : Enum { // Public signature: /TestFinalEnum1.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestFinalEnum1.X1 // Public signature: /TestFinalEnum1.X1|null[0] @@ -571,6 +576,7 @@ enum class TestFinalEnum2 : Enum { // Public signature: /TestFinalEnum2.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: TestFinalEnum2.X1 // Public signature: /TestFinalEnum2.X1|null[0] @@ -692,6 +698,7 @@ enum class TestFinalEnum3 : Enum { // Public signature: /TestFinalEnum3.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestFinalEnum3.X1 // Public signature: /TestFinalEnum3.X1|null[0] @@ -819,6 +826,7 @@ open enum class TestOpenEnum1 : Enum { // Public signature: /TestOpenEnum1.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestOpenEnum1.X1 // Public signature: /TestOpenEnum1.X1|null[0] @@ -833,6 +841,7 @@ open enum class TestOpenEnum1 : Enum { // Public signature: /TestOpenEnum1.X1..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestOpenEnum1.X1#compareTo(TestOpenEnum1){}kotlin.Int // Public signature: /TestOpenEnum1.X1..compareTo|5969408945777389066[0] @@ -1021,6 +1030,7 @@ open enum class TestOpenEnum2 : Enum { // Public signature: /TestOpenEnum2.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: TestOpenEnum2.X1 // Public signature: /TestOpenEnum2.X1|null[0] @@ -1035,6 +1045,7 @@ open enum class TestOpenEnum2 : Enum { // Public signature: /TestOpenEnum2.X1..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestOpenEnum2.X1#compareTo(TestOpenEnum2){}kotlin.Int // Public signature: /TestOpenEnum2.X1..compareTo|-5309775767017986668[0] @@ -1230,7 +1241,6 @@ open enum class TestOpenEnum2 : Enum { // Mangled name: IFoo // Public signature: /IFoo|null[0] interface IFoo { - // CHECK: // Mangled name: IFoo#foo(){} // Public signature: /IFoo.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/classes/enumEntries.fir.ir.txt b/compiler/testData/ir/irText/classes/enumEntries.fir.ir.txt index da4243f21e7..cef17709f7c 100644 --- a/compiler/testData/ir/irText/classes/enumEntries.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enumEntries.fir.ir.txt @@ -58,8 +58,6 @@ FILE fqName: fileName:/enumEntries.kt public final fun (): kotlin.Int declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyEnum> FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.MyEnum> - annotations: - OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun box (): kotlin.enums.EnumEntries<.MyEnum> declared in ' CALL 'public final fun (): kotlin.enums.EnumEntries<.MyEnum> declared in .MyEnum' type=kotlin.enums.EnumEntries<.MyEnum> origin=GET_PROPERTY diff --git a/compiler/testData/ir/irText/classes/enumEntries.fir.kt.txt b/compiler/testData/ir/irText/classes/enumEntries.fir.kt.txt index 2b6b2b1323c..3e261f3ae32 100644 --- a/compiler/testData/ir/irText/classes/enumEntries.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/enumEntries.fir.kt.txt @@ -18,7 +18,6 @@ enum class MyEnum : Enum { } -@OptIn(markerClass = [ExperimentalStdlibApi::class]) fun box(): EnumEntries { return () } diff --git a/compiler/testData/ir/irText/classes/enumEntries.ir.txt b/compiler/testData/ir/irText/classes/enumEntries.ir.txt index 013d4e33fec..28e31898faf 100644 --- a/compiler/testData/ir/irText/classes/enumEntries.ir.txt +++ b/compiler/testData/ir/irText/classes/enumEntries.ir.txt @@ -58,8 +58,6 @@ FILE fqName: fileName:/enumEntries.kt correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] SYNTHETIC_BODY kind=ENUM_ENTRIES FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.MyEnum> - annotations: - OptIn(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun box (): kotlin.enums.EnumEntries<.MyEnum> declared in ' CALL 'public final fun (): kotlin.enums.EnumEntries<.MyEnum> declared in .MyEnum' type=kotlin.enums.EnumEntries<.MyEnum> origin=GET_PROPERTY diff --git a/compiler/testData/ir/irText/classes/enumEntries.kt b/compiler/testData/ir/irText/classes/enumEntries.kt index 211eef071b1..14463431cf6 100644 --- a/compiler/testData/ir/irText/classes/enumEntries.kt +++ b/compiler/testData/ir/irText/classes/enumEntries.kt @@ -1,5 +1,3 @@ -// !LANGUAGE: +EnumEntries -// TARGET_BACKEND: JVM_IR // FULL_JDK // WITH_STDLIB @@ -7,5 +5,4 @@ enum class MyEnum { Ok, Nope } -@OptIn(ExperimentalStdlibApi::class) fun box() = MyEnum.entries diff --git a/compiler/testData/ir/irText/classes/enumEntries.kt.txt b/compiler/testData/ir/irText/classes/enumEntries.kt.txt index 2b6b2b1323c..3e261f3ae32 100644 --- a/compiler/testData/ir/irText/classes/enumEntries.kt.txt +++ b/compiler/testData/ir/irText/classes/enumEntries.kt.txt @@ -18,7 +18,6 @@ enum class MyEnum : Enum { } -@OptIn(markerClass = [ExperimentalStdlibApi::class]) fun box(): EnumEntries { return () } diff --git a/compiler/testData/ir/irText/classes/enumEntries.sig.kt.txt b/compiler/testData/ir/irText/classes/enumEntries.sig.kt.txt index 60550cdd7aa..b37217ce5f1 100644 --- a/compiler/testData/ir/irText/classes/enumEntries.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/enumEntries.sig.kt.txt @@ -7,6 +7,7 @@ enum class MyEnum : Enum { // Public signature: /MyEnum.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: MyEnum.Nope // Public signature: /MyEnum.Nope|null[0] @@ -21,36 +22,60 @@ enum class MyEnum : Enum { // Mangled name: MyEnum#valueOf#static(kotlin.String){}MyEnum // Public signature: /MyEnum.valueOf|4316550590519800984[0] // Public signature debug description: valueOf#static(kotlin.String){}MyEnum + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#valueOf#static(kotlin.String){} + // Public signature: /MyEnum.valueOf|-4683474617854611729[0] + // Public signature debug description: valueOf#static(kotlin.String){} fun valueOf(value: String): MyEnum // CHECK JVM_IR: // Mangled name: MyEnum#values#static(){}kotlin.Array // Public signature: /MyEnum.values|3097625172661156808[0] // Public signature debug description: values#static(){}kotlin.Array + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#values#static(){} + // Public signature: /MyEnum.values|-8715569000920726747[0] + // Public signature debug description: values#static(){} fun values(): Array // CHECK JVM_IR: // Mangled name: MyEnum#compareTo(MyEnum){}kotlin.Int // Public signature: /MyEnum.compareTo|2015858924903177055[0] // Public signature debug description: compareTo(MyEnum){}kotlin.Int + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#compareTo(MyEnum){} + // Public signature: /MyEnum.compareTo|-1404018836780573573[0] + // Public signature debug description: compareTo(MyEnum){} /* fake */ override operator fun compareTo(other: MyEnum): Int // CHECK JVM_IR: // Mangled name: MyEnum#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /MyEnum.equals|722809408929142791[0] // Public signature debug description: equals(kotlin.Any?){}kotlin.Boolean + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#equals(kotlin.Any?){} + // Public signature: /MyEnum.equals|4638265728071529943[0] + // Public signature debug description: equals(kotlin.Any?){} /* fake */ override operator fun equals(other: Any?): Boolean // CHECK JVM_IR: // Mangled name: MyEnum#hashCode(){}kotlin.Int // Public signature: /MyEnum.hashCode|-8048879360829830756[0] // Public signature debug description: hashCode(){}kotlin.Int + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#hashCode(){} + // Public signature: /MyEnum.hashCode|3409210261493131192[0] + // Public signature debug description: hashCode(){} /* fake */ override fun hashCode(): Int // CHECK JVM_IR: // Mangled name: MyEnum#toString(){}kotlin.String // Public signature: /MyEnum.toString|6958853723545266802[0] // Public signature debug description: toString(){}kotlin.String + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#toString(){} + // Public signature: /MyEnum.toString|-1522858123163872138[0] + // Public signature debug description: toString(){} /* fake */ override fun toString(): String // CHECK: @@ -62,6 +87,10 @@ enum class MyEnum : Enum { // Mangled name: MyEnum##static(){}kotlin.enums.EnumEntries // Public signature: /MyEnum.entries.|-3922959509726908718[0] // Public signature debug description: #static(){}kotlin.enums.EnumEntries + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum##static(){} + // Public signature: /MyEnum.entries.|-6068527377476727729[0] + // Public signature debug description: #static(){} get(): EnumEntries // CHECK: @@ -73,6 +102,10 @@ enum class MyEnum : Enum { // Mangled name: MyEnum#(){}kotlin.String // Public signature: /MyEnum.name.|-8006111524522882650[0] // Public signature debug description: (){}kotlin.String + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#(){} + // Public signature: /MyEnum.name.|5879344792307730109[0] + // Public signature debug description: (){} /* fake */ override get(): String // CHECK: @@ -84,6 +117,10 @@ enum class MyEnum : Enum { // Mangled name: MyEnum#(){}kotlin.Int // Public signature: /MyEnum.ordinal.|-6902664390061762634[0] // Public signature debug description: (){}kotlin.Int + // CHECK JS_IR NATIVE: + // Mangled name: MyEnum#(){} + // Public signature: /MyEnum.ordinal.|8409904226035914023[0] + // Public signature debug description: (){} /* fake */ override get(): Int } @@ -92,6 +129,9 @@ enum class MyEnum : Enum { // Mangled name: #box(){}kotlin.enums.EnumEntries // Public signature: /box|700999420470824741[0] // Public signature debug description: box(){}kotlin.enums.EnumEntries -@OptIn(markerClass = [ExperimentalStdlibApi::class]) +// CHECK JS_IR NATIVE: +// Mangled name: #box(){} +// Public signature: /box|2173511048851971368[0] +// Public signature debug description: box(){} fun box(): EnumEntries diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.sig.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.sig.kt.txt index c50f77c1fd3..a113e7dfe78 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.sig.kt.txt @@ -57,16 +57,19 @@ open enum class A : Enum { // Public signature: /A.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() + // CHECK: // Mangled name: A#(kotlin.String){} // Public signature: /A.|1280618353163213788[0] // Public signature debug description: (kotlin.String){} private constructor(arg: String) + // CHECK: // Mangled name: A#(kotlin.Int){} // Public signature: /A.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) + // CHECK: // Mangled name: A.X // Public signature: /A.X|null[0] @@ -86,6 +89,7 @@ open enum class A : Enum { // Public signature: /A.Y..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: A.Y#compareTo(A){}kotlin.Int // Public signature: /A.Y..compareTo|-315052537630360750[0] diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.sig.kt.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.sig.kt.txt index a5f4504f863..a004c40e4b5 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.sig.kt.txt @@ -22,11 +22,13 @@ enum class Test0 : Enum { // Public signature: /Test0.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() + // CHECK: // Mangled name: Test0#(kotlin.Int){} // Public signature: /Test0.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: Test0.ZERO // Public signature: /Test0.ZERO|null[0] @@ -163,11 +165,13 @@ enum class Test1 : Enum { // Public signature: /Test1.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() + // CHECK: // Mangled name: Test1#(kotlin.Int){} // Public signature: /Test1.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: Test1.ONE // Public signature: /Test1.ONE|null[0] @@ -309,11 +313,13 @@ abstract enum class Test2 : Enum { // Public signature: /Test2.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() + // CHECK: // Mangled name: Test2#(kotlin.Int){} // Public signature: /Test2.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} private constructor(x: Int) /* primary */ + // CHECK: // Mangled name: Test2.ONE // Public signature: /Test2.ONE|null[0] @@ -328,6 +334,7 @@ abstract enum class Test2 : Enum { // Public signature: /Test2.ONE..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: Test2.ONE#compareTo(Test2){}kotlin.Int // Public signature: /Test2.ONE..compareTo|-4058923296557042542[0] @@ -435,6 +442,7 @@ abstract enum class Test2 : Enum { // Public signature: /Test2.ZERO..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: Test2.ZERO#compareTo(Test2){}kotlin.Int // Public signature: /Test2.ZERO..compareTo|-4058923296557042542[0] diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.sig.kt.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.sig.kt.txt index 27ddf4d2094..b11480f4716 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.sig.kt.txt @@ -79,6 +79,7 @@ class TestJFoo : IFoo { // Public signature: /TestJFoo.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestJFoo#foo(){}kotlin.String // Public signature: /TestJFoo.foo|485335955883620819[0] @@ -96,6 +97,7 @@ class TestK1 : IFoo { // Public signature: /TestK1.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestK1#foo(){}kotlin.String // Public signature: /TestK1.foo|485335955883620819[0] @@ -113,6 +115,7 @@ class TestK2 : IFoo { // Public signature: /TestK2.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestK2#foo(){}kotlin.String // Public signature: /TestK2.foo|485335955883620819[0] @@ -130,6 +133,7 @@ class TestK3 : IFoo { // Public signature: /TestK3.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestK3#foo(){}kotlin.String // Public signature: /TestK3.foo|485335955883620819[0] @@ -147,6 +151,7 @@ class TestK4 : IFoo { // Public signature: /TestK4.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestK4#foo(){}kotlin.String // Public signature: /TestK4.foo|485335955883620819[0] @@ -159,7 +164,6 @@ class TestK4 : IFoo { // Mangled name: IFoo // Public signature: /IFoo|null[0] interface IFoo { - // CHECK JVM_IR: // Mangled name: IFoo#foo(){}kotlin.String // Public signature: /IFoo.foo|485335955883620819[0] diff --git a/compiler/testData/ir/irText/classes/inlineClass.sig.kt.txt b/compiler/testData/ir/irText/classes/inlineClass.sig.kt.txt index 7216b328427..bf94c33a34c 100644 --- a/compiler/testData/ir/irText/classes/inlineClass.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/inlineClass.sig.kt.txt @@ -22,6 +22,7 @@ value class Test { // Public signature: /Test.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(x: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: Test#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /Test.equals|722809408929142791[0] diff --git a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.sig.kt.txt b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.sig.kt.txt index c79e6a143e5..d168ee609b9 100644 --- a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.sig.kt.txt @@ -59,6 +59,7 @@ value class IC { // Public signature: /IC.|-2549303465575104617[0] // Public signature debug description: (C<1:0>){} constructor(c: C) /* primary */ + // CHECK JVM_IR: // Mangled name: IC#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /IC.equals|722809408929142791[0] diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.sig.kt.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.sig.kt.txt index 7728140294e..50cf7b784cd 100644 --- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.sig.kt.txt @@ -26,6 +26,7 @@ class Outer { // Public signature: /Outer.Inner.|-5645683436151566731[0] // Public signature debug description: (){} constructor() + // CHECK: // Mangled name: Outer.Inner#(kotlin.Int){} // Public signature: /Outer.Inner.|-5182794243525578284[0] diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.sig.kt.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.sig.kt.txt index c45d776b95f..6ec31641c53 100644 --- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.sig.kt.txt @@ -72,7 +72,6 @@ class Outer { // Mangled name: IFoo // Public signature: /IFoo|null[0] interface IFoo { - // CHECK: // Mangled name: IFoo#foo(){} // Public signature: /IFoo.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.sig.kt.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.sig.kt.txt index 203f4534da7..0578e94460c 100644 --- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.sig.kt.txt @@ -73,6 +73,7 @@ class TestWithDelegatingConstructor : Base { // Public signature: /TestWithDelegatingConstructor.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(x: Int) + // CHECK: // Mangled name: TestWithDelegatingConstructor#(kotlin.Int;kotlin.Int){} // Public signature: /TestWithDelegatingConstructor.|-7691762014320324121[0] diff --git a/compiler/testData/ir/irText/classes/privateInterface.sig.kt.txt b/compiler/testData/ir/irText/classes/privateInterface.sig.kt.txt index 74f2eae1aa2..7a9483525b1 100644 --- a/compiler/testData/ir/irText/classes/privateInterface.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/privateInterface.sig.kt.txt @@ -7,6 +7,7 @@ open class C1 : I { // Public signature: /C1.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: C1#bazString(){}kotlin.String // Public signature: /C1.bazString|4745561783571976677[0] @@ -66,6 +67,7 @@ class C2 : C1 { // Public signature: /C2.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: C2#barString(){}kotlin.String // Public signature: /C2.barString|1448966844562545716[0] @@ -120,7 +122,6 @@ class C2 : C1 { // Mangled name: I // Public signature: [ File '/privateInterface.kt' <- /I|null[0] ] private interface I { - // CHECK JVM_IR: // Mangled name: I#barString(){}kotlin.String // Public signature: [ File '/privateInterface.kt' <- /I.barString|1448966844562545716[0] ] diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.sig.kt.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.sig.kt.txt index 94fc38dd346..6fa1e6f668f 100644 --- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.sig.kt.txt @@ -35,7 +35,6 @@ class CBoth : ILeft, IRight { // Mangled name: ILeft // Public signature: /ILeft|null[0] interface ILeft { - // CHECK: // Mangled name: ILeft#foo(){} // Public signature: /ILeft.foo|-1041209573719867811[0] @@ -63,7 +62,6 @@ interface ILeft { // Mangled name: IRight // Public signature: /IRight|null[0] interface IRight { - // CHECK: // Mangled name: IRight#foo(){} // Public signature: /IRight.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.sig.kt.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.sig.kt.txt index 96ee417a2c2..952f00c5512 100644 --- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.sig.kt.txt @@ -34,11 +34,13 @@ class TestInitBlock : Base { // Public signature: /TestInitBlock.|-5645683436151566731[0] // Public signature debug description: (){} constructor() + // CHECK: // Mangled name: TestInitBlock#(kotlin.Int){} // Public signature: /TestInitBlock.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(y: Int) + // CHECK: // Mangled name: TestInitBlock#(kotlin.Any){} // Public signature: /TestInitBlock.|4518179880532599055[0] diff --git a/compiler/testData/ir/irText/classes/secondaryConstructors.sig.kt.txt b/compiler/testData/ir/irText/classes/secondaryConstructors.sig.kt.txt index a3df2ea0784..26802275d52 100644 --- a/compiler/testData/ir/irText/classes/secondaryConstructors.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/secondaryConstructors.sig.kt.txt @@ -7,6 +7,7 @@ class C { // Public signature: /C.|-5645683436151566731[0] // Public signature debug description: (){} constructor() + // CHECK: // Mangled name: C#(kotlin.Int){} // Public signature: /C.|-5182794243525578284[0] diff --git a/compiler/testData/ir/irText/classes/superCallsComposed.sig.kt.txt b/compiler/testData/ir/irText/classes/superCallsComposed.sig.kt.txt index c0fbbb8c7bd..a77698fec92 100644 --- a/compiler/testData/ir/irText/classes/superCallsComposed.sig.kt.txt +++ b/compiler/testData/ir/irText/classes/superCallsComposed.sig.kt.txt @@ -68,7 +68,6 @@ class Derived : Base, BaseI { // Mangled name: BaseI // Public signature: /BaseI|null[0] interface BaseI { - // CHECK: // Mangled name: BaseI#foo(){} // Public signature: /BaseI.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt index 700f9ca6112..2fd3880dc42 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt @@ -23,7 +23,6 @@ class TestClass { @TestAnn(x = "interface") interface TestInterface { - } @TestAnn(x = "object") diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt index 700f9ca6112..2fd3880dc42 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt @@ -23,7 +23,6 @@ class TestClass { @TestAnn(x = "interface") interface TestInterface { - } @TestAnn(x = "object") diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.sig.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.sig.kt.txt index fb3baaef3d1..50d945d4135 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.sig.kt.txt @@ -86,6 +86,7 @@ enum class TestEnum : Enum { // Public signature: /TestEnum.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: TestEnum#valueOf#static(kotlin.String){}TestEnum // Public signature: /TestEnum.valueOf|1811575739170804829[0] @@ -198,7 +199,6 @@ enum class TestEnum : Enum { // Public signature: /TestInterface|null[0] @TestAnn(x = "interface") interface TestInterface { - } // CHECK: diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.sig.kt.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.sig.kt.txt index 0d88d2550c4..226a873c2ca 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.sig.kt.txt @@ -35,6 +35,7 @@ class TestClass { // Public signature debug description: (){} @TestAnn(x = 1) constructor() /* primary */ + // CHECK: // Mangled name: TestClass#(kotlin.Int){} // Public signature: /TestClass.|-5182794243525578284[0] diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.sig.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.sig.kt.txt index 8889abf67ea..42d177045b6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.sig.kt.txt @@ -34,6 +34,7 @@ enum class En : Enum { // Public signature: /En.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: En.A // Public signature: /En.A|null[0] diff --git a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.kt.txt index 2bfcc0dc06c..574265bc5a1 100644 --- a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.kt.txt @@ -27,7 +27,6 @@ open annotation class Test2 : Annotation { } interface I { - } open annotation class Test3> : Annotation { diff --git a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.kt.txt b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.kt.txt index 0c0e15bcc16..6676e6aeef6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.kt.txt @@ -27,7 +27,6 @@ open annotation class Test2 : Annotation { } interface I { - } open annotation class Test3> : Annotation { diff --git a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.sig.kt.txt b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.sig.kt.txt index 6a2fdb0f5b8..6b594555c4d 100644 --- a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.sig.kt.txt @@ -180,6 +180,5 @@ class CC { // Mangled name: ann.I // Public signature: ann/I|null[0] interface I { - } diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.sig.kt.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.sig.kt.txt index 23a427a6d34..9f0edcd1d39 100644 --- a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.sig.kt.txt @@ -128,7 +128,6 @@ class ExplicitOverride : IFoo { // Mangled name: IFoo // Public signature: /IFoo|null[0] interface IFoo { - // CHECK: // Mangled name: IFoo@kotlin.String{}extProp // Public signature: /IFoo.extProp|9137761441129982647[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.sig.kt.txt index 9cf7f9d144a..3a993310c7a 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.sig.kt.txt @@ -47,6 +47,7 @@ data class MyContainer { // Public signature: /MyContainer.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(i: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: MyContainer#component1(){}kotlin.Int // Public signature: /MyContainer.component1|-8217597213800111288[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.sig.kt.txt index 6788b7b77e5..378d566462c 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.sig.kt.txt @@ -27,6 +27,7 @@ data class MyContainer { // Public signature: /MyContainer.|1280618353163213788[0] // Public signature debug description: (kotlin.String){} constructor(s: String) /* primary */ + // CHECK JVM_IR: // Mangled name: MyContainer#component1(){}kotlin.String // Public signature: /MyContainer.component1|-7481405593404337796[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.sig.kt.txt index 142ecde2511..a976dc55532 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.sig.kt.txt @@ -47,6 +47,7 @@ data class Result { // Public signature: /Result.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(i: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: Result#component1(){}kotlin.Int // Public signature: /Result.component1|-8217597213800111288[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/canvas.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/canvas.sig.kt.txt index 838c8043e24..85a9c064c83 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/canvas.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/canvas.sig.kt.txt @@ -24,7 +24,6 @@ class Circle : Shape { // Mangled name: Canvas // Public signature: /Canvas|null[0] interface Canvas { - // CHECK: // Mangled name: Canvas{}suffix // Public signature: /Canvas.suffix|-3301965527200666288[0] @@ -46,7 +45,6 @@ interface Canvas { // Mangled name: Shape // Public signature: /Shape|null[0] interface Shape { - // CHECK JVM_IR: // Mangled name: Shape#draw!Canvas(){}kotlin.String // Public signature: /Shape.draw|-6733499063990640842[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.sig.kt.txt index 1ca6c6caf58..5cec00f194d 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.sig.kt.txt @@ -37,6 +37,7 @@ data class Pair { // Public signature: /Pair.|3086114026882374588[0] // Public signature debug description: (1:0;1:1){} constructor(first: A, second: B) /* primary */ + // CHECK JVM_IR: // Mangled name: Pair#component1(){}1:0 // Public signature: /Pair.component1|2393470133763651536[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.sig.kt.txt index 71e1cadab83..32cd6d56769 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.sig.kt.txt @@ -33,7 +33,6 @@ interface Monoid : Semigroup { // Mangled name: Semigroup // Public signature: /Semigroup|null[0] interface Semigroup { - // CHECK JVM_IR: // Mangled name: Semigroup#combine@1:0(1:0){}1:0 // Public signature: /Semigroup.combine|-3517256775590682507[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.sig.kt.txt index 2f5272816db..093f72f269f 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.sig.kt.txt @@ -27,6 +27,7 @@ data class Counter { // Public signature: /Counter.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(i: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: Counter#component1(){}kotlin.Int // Public signature: /Counter.component1|-8217597213800111288[0] @@ -103,6 +104,7 @@ data class CounterConfig { // Public signature: /CounterConfig.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(max: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: CounterConfig#component1(){}kotlin.Int // Public signature: /CounterConfig.component1|-8217597213800111288[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/lazy.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/lazy.kt.txt index 02f5f028584..ec4ecfed2cb 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/lazy.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/lazy.kt.txt @@ -1,5 +1,4 @@ interface Lazy { - } fun test1($context_receiver_0: Lazy, $context_receiver_1: Lazy) { diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/lazy.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/lazy.sig.kt.txt index 9fa4fdd61af..2c0e21125fc 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/lazy.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/lazy.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: Lazy // Public signature: /Lazy|null[0] interface Lazy { - } // CHECK: diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/plusMatrix.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/plusMatrix.sig.kt.txt index b38cf1bfbad..5a84f25faf3 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/plusMatrix.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/plusMatrix.sig.kt.txt @@ -14,7 +14,6 @@ class Matrix { // Mangled name: NumberOperations // Public signature: /NumberOperations|null[0] interface NumberOperations { - // CHECK JVM_IR: // Mangled name: NumberOperations#plus@kotlin.Number(kotlin.Number){}kotlin.Number // Public signature: /NumberOperations.plus|-6518987633126930952[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/property.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/property.sig.kt.txt index 97b6018fb7f..9535c6adb71 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/property.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/property.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: A // Public signature: /A|null[0] interface A { - // CHECK JVM_IR: // Mangled name: A#a(){}kotlin.Int // Public signature: /A.a|5993980063692763883[0] @@ -19,7 +18,6 @@ interface A { // Mangled name: B // Public signature: /B|null[0] interface B { - // CHECK JVM_IR: // Mangled name: B#b(){}kotlin.Int // Public signature: /B.b|-6472101675379091489[0] diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.sig.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.sig.kt.txt index b50d768ef5a..79eb24fdd28 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.sig.kt.txt @@ -42,6 +42,7 @@ data class Result { // Public signature: /Result.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(i: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: Result#component1(){}kotlin.Int // Public signature: /Result.component1|-8217597213800111288[0] diff --git a/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder1.sig.kt.txt b/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder1.sig.kt.txt index 3ad403ccd43..20289a5544b 100644 --- a/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder1.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder1.sig.kt.txt @@ -66,6 +66,7 @@ class Derived : DerivedBase, Base { // Public signature: foo/Derived.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: foo.Derived#foo(kotlin.String){}kotlin.String // Public signature: foo/Derived.foo|-5534735991146511619[0] @@ -87,6 +88,7 @@ class Derived1 : DerivedBase, Base { // Public signature: foo/Derived1.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: foo.Derived1#foo(kotlin.String){}kotlin.String // Public signature: foo/Derived1.foo|-5534735991146511619[0] @@ -115,7 +117,6 @@ open class DerivedBase { // Mangled name: foo.Base // Public signature: foo/Base|null[0] interface Base { - // CHECK JVM_IR: // Mangled name: foo.Base#foo(kotlin.String){}kotlin.String // Public signature: foo/Base.foo|-5534735991146511619[0] diff --git a/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder2.sig.kt.txt b/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder2.sig.kt.txt index f078d11f901..55e8d775f1d 100644 --- a/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder2.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/delegate/delegationEvaluationOrder2.sig.kt.txt @@ -103,6 +103,7 @@ class Derived : DerivedBase, Base, Base2 { // Public signature: foo/Derived.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: foo.Derived#bar(kotlin.String){}kotlin.String // Public signature: foo/Derived.bar|2000415168157940991[0] @@ -134,6 +135,7 @@ class Derived1 : DerivedBase, Base, Base2 { // Public signature: foo/Derived1.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: foo.Derived1#bar(kotlin.String){}kotlin.String // Public signature: foo/Derived1.bar|2000415168157940991[0] @@ -165,6 +167,7 @@ class Derived2 : DerivedBase, Base, Base2 { // Public signature: foo/Derived2.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: foo.Derived2#bar(kotlin.String){}kotlin.String // Public signature: foo/Derived2.bar|2000415168157940991[0] @@ -203,7 +206,6 @@ open class DerivedBase { // Mangled name: foo.Base // Public signature: foo/Base|null[0] interface Base { - // CHECK JVM_IR: // Mangled name: foo.Base#foo(kotlin.String){}kotlin.String // Public signature: foo/Base.foo|-5534735991146511619[0] @@ -220,7 +222,6 @@ interface Base { // Mangled name: foo.Base2 // Public signature: foo/Base2|null[0] interface Base2 { - // CHECK JVM_IR: // Mangled name: foo.Base2#bar(kotlin.String){}kotlin.String // Public signature: foo/Base2.bar|2000415168157940991[0] diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.sig.kt.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.sig.kt.txt index c687973410e..2935a41eb64 100644 --- a/compiler/testData/ir/irText/declarations/fakeOverrides.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/fakeOverrides.sig.kt.txt @@ -53,7 +53,6 @@ class Test1 : CFoo, IBar, IFooStr { // Mangled name: IBar // Public signature: /IBar|null[0] interface IBar { - // CHECK: // Mangled name: IBar{}bar // Public signature: /IBar.bar|-7864284097863469857[0] @@ -75,7 +74,6 @@ interface IBar { // Mangled name: IFooStr // Public signature: /IFooStr|null[0] interface IFooStr { - // CHECK: // Mangled name: IFooStr#foo(kotlin.String){} // Public signature: /IFooStr.foo|1351044947738582195[0] diff --git a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.sig.kt.txt index 523be118d0a..2758684fe81 100644 --- a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.sig.kt.txt @@ -22,6 +22,7 @@ value class IT { // Public signature: /IT.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(x: Int) /* primary */ + // CHECK JVM_IR: // Mangled name: IT#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /IT.equals|722809408929142791[0] @@ -78,6 +79,7 @@ value class InlineMutableSet : MutableSet { // Public signature: /InlineMutableSet.|-3183535736515224569[0] // Public signature debug description: (kotlin.collections.MutableSet){} constructor(ms: MutableSet) /* primary */ + // CHECK JVM_IR: // Mangled name: InlineMutableSet#equals(kotlin.Any?){}kotlin.Boolean // Public signature: /InlineMutableSet.equals|722809408929142791[0] diff --git a/compiler/testData/ir/irText/declarations/interfaceProperties.sig.kt.txt b/compiler/testData/ir/irText/declarations/interfaceProperties.sig.kt.txt index 984fb98651d..970e75e298d 100644 --- a/compiler/testData/ir/irText/declarations/interfaceProperties.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/interfaceProperties.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: C // Public signature: /C|null[0] interface C { - // CHECK: // Mangled name: C{}test1 // Public signature: /C.test1|6005685442305498193[0] diff --git a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.sig.kt.txt b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.sig.kt.txt index 6e8a3aa5d1b..0720c4acce1 100644 --- a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.sig.kt.txt @@ -19,6 +19,7 @@ data class MyRec : Record { // Public signature: /MyRec.|1280618353163213788[0] // Public signature debug description: (kotlin.String){} constructor(name: String) /* primary */ + // CHECK JVM_IR: // Mangled name: MyRec#component1(){}kotlin.String // Public signature: /MyRec.component1|-7481405593404337796[0] diff --git a/compiler/testData/ir/irText/declarations/kt35550.sig.kt.txt b/compiler/testData/ir/irText/declarations/kt35550.sig.kt.txt index 6ee0e042bbe..a59a78af0f1 100644 --- a/compiler/testData/ir/irText/declarations/kt35550.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/kt35550.sig.kt.txt @@ -29,7 +29,6 @@ class A : I { // Mangled name: I // Public signature: /I|null[0] interface I { - // CHECK: // Mangled name: I@0:0{0ยง}id // Public signature: /I.id|6409895071901545951[0] diff --git a/compiler/testData/ir/irText/declarations/kt52677.kt.txt b/compiler/testData/ir/irText/declarations/kt52677.kt.txt index b5b83b33e02..0f7ad5b4595 100644 --- a/compiler/testData/ir/irText/declarations/kt52677.kt.txt +++ b/compiler/testData/ir/irText/declarations/kt52677.kt.txt @@ -57,7 +57,6 @@ data class LoginSuccessPacket { typealias Uuid = @MySerializable(c = UuidSerializer::class) Uuid1 interface MySerializer { - } object UuidSerializer : MySerializer<@MySerializable(c = UuidSerializer::class) Uuid1> { diff --git a/compiler/testData/ir/irText/declarations/kt52677.sig.kt.txt b/compiler/testData/ir/irText/declarations/kt52677.sig.kt.txt index 25a2292a579..fbde2cba32f 100644 --- a/compiler/testData/ir/irText/declarations/kt52677.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/kt52677.sig.kt.txt @@ -50,6 +50,7 @@ data class LoginSuccessPacket { // Public signature: /LoginSuccessPacket.|-1666114669831529718[0] // Public signature debug description: (Uuid1){} constructor(id: @MySerializable(c = UuidSerializer::class) Uuid1) /* primary */ + // CHECK JVM_IR: // Mangled name: LoginSuccessPacket#component1(){}Uuid1 // Public signature: /LoginSuccessPacket.component1|-3428488995872773450[0] @@ -118,7 +119,6 @@ class Uuid1 { // Mangled name: MySerializer // Public signature: /MySerializer|null[0] interface MySerializer { - } // CHECK: diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt index f2acd578282..c4380e45d90 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt @@ -1,11 +1,13 @@ expect abstract class A { protected expect constructor() /* primary */ + expect abstract fun foo() } expect open class B : A { expect constructor(i: Int) /* primary */ + expect override fun foo() expect open fun bar(s: String) diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.sig.kt.txt index b735bb67c88..d7444249419 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.sig.kt.txt @@ -4,7 +4,6 @@ // Mangled name: I1 // Public signature: /I1|null[0] interface I1 { - // CHECK JVM_IR: // Mangled name: I1#f(){}kotlin.String // Public signature: /I1.f|9098388873611041001[0] @@ -36,7 +35,6 @@ interface I1 { // Mangled name: I2 // Public signature: /I2|null[0] interface I2 { - // CHECK JVM_IR: // Mangled name: I2#f(){}kotlin.String // Public signature: /I2.f|9098388873611041001[0] diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt.txt index 094f3d18c56..9667911623d 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt.txt @@ -1,5 +1,6 @@ expect open class C1 { expect constructor() /* primary */ + expect fun f(): String expect val p: Int diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.sig.kt.txt index 6c541714a54..c6b9343e204 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.sig.kt.txt @@ -128,6 +128,7 @@ enum class MyEnum : Enum { // Public signature: /MyEnum.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: MyEnum.BAR // Public signature: /MyEnum.BAR|null[0] diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt index 70e250869d1..09902e6f5b8 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt @@ -11,6 +11,7 @@ enum class MyEnum : Enum { // Public signature: /MyEnum.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: MyEnum.BAR // Public signature: /MyEnum.BAR|null[0] diff --git a/compiler/testData/ir/irText/declarations/parameters/class.kt.txt b/compiler/testData/ir/irText/declarations/parameters/class.kt.txt index 197c391a73e..a622d5e8fcf 100644 --- a/compiler/testData/ir/irText/declarations/parameters/class.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/class.kt.txt @@ -1,6 +1,5 @@ interface TestInterface { interface TestNestedInterface { - } } diff --git a/compiler/testData/ir/irText/declarations/parameters/class.sig.kt.txt b/compiler/testData/ir/irText/declarations/parameters/class.sig.kt.txt index a3ee3057190..90d761b5965 100644 --- a/compiler/testData/ir/irText/declarations/parameters/class.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/class.sig.kt.txt @@ -42,7 +42,6 @@ interface TestInterface { // Mangled name: TestInterface.TestNestedInterface // Public signature: /TestInterface.TestNestedInterface|null[0] interface TestNestedInterface { - } } diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.sig.kt.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.sig.kt.txt index 57f6f3c6c58..96b8517bef2 100644 --- a/compiler/testData/ir/irText/declarations/parameters/constructor.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/constructor.sig.kt.txt @@ -83,6 +83,7 @@ class Test2 { // Public signature: /Test2.TestInner.|-8731461708390519279[0] // Public signature debug description: (1:0){} constructor(z: Z) /* primary */ + // CHECK: // Mangled name: Test2.TestInner#(1:0;kotlin.Int){} // Public signature: /Test2.TestInner.|7281397193015694517[0] @@ -165,6 +166,7 @@ class Test4 { // Public signature: /Test4.|-5182794243525578284[0] // Public signature debug description: (kotlin.Int){} constructor(x: Int) /* primary */ + // CHECK: // Mangled name: Test4#(kotlin.Int;kotlin.Int){} // Public signature: /Test4.|-7691762014320324121[0] diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.sig.kt.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.sig.kt.txt index 04a0011ad86..36afdd920f6 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.sig.kt.txt @@ -37,6 +37,7 @@ data class Test { // Public signature: /Test.|-7411275398527089511[0] // Public signature debug description: (1:0;kotlin.String){} constructor(x: T, y: String) /* primary */ + // CHECK JVM_IR: // Mangled name: Test#component1(){}1:0 // Public signature: /Test.component1|2393470133763651536[0] diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.sig.kt.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.sig.kt.txt index 2d0b4e016f9..84ae75e40bf 100644 --- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.sig.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.sig.kt.txt @@ -7,6 +7,7 @@ class Test : IBase { // Public signature: /Test.|-3017997426280513504[0] // Public signature debug description: (IBase<1:0>){} constructor(impl: IBase) /* primary */ + // CHECK: // Mangled name: Test#foo(kotlin.Int){} // Public signature: /Test.foo|-104159190164110731[0] @@ -40,7 +41,6 @@ class Test : IBase { // Mangled name: IBase // Public signature: /IBase|null[0] interface IBase { - // CHECK: // Mangled name: IBase#foo(kotlin.Int){} // Public signature: /IBase.foo|-104159190164110731[0] diff --git a/compiler/testData/ir/irText/declarations/typeAlias.kt.txt b/compiler/testData/ir/irText/declarations/typeAlias.kt.txt index bb08696464f..ff5649c6525 100644 --- a/compiler/testData/ir/irText/declarations/typeAlias.kt.txt +++ b/compiler/testData/ir/irText/declarations/typeAlias.kt.txt @@ -13,5 +13,4 @@ class C { @Suppress(names = ["TOPLEVEL_TYPEALIASES_ONLY"]) typealias TestNested = String - } diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.sig.kt.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.sig.kt.txt index dcc7195aa7d..8dce13af528 100644 --- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IA // Public signature: /IA|null[0] interface IA { - // CHECK JVM_IR: // Mangled name: IA#get(kotlin.String){}kotlin.Int // Public signature: /IA.get|8115151130332405730[0] @@ -19,7 +18,6 @@ interface IA { // Mangled name: IB // Public signature: /IB|null[0] interface IB { - // CHECK: // Mangled name: IB#set@IA(kotlin.String;kotlin.Int){} // Public signature: /IB.set|-3878244067281394744[0] diff --git a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.kt.txt index 19c5bc615d9..fbca948c6a8 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.kt.txt @@ -4,7 +4,6 @@ fun interface IFoo { } fun interface IFoo2 : IFoo { - } object A { diff --git a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt index 1e3c7570915..ab79b56c7df 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt @@ -4,7 +4,6 @@ fun interface IFoo { } fun interface IFoo2 : IFoo { - } object A { diff --git a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.sig.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.sig.kt.txt index afd076da29a..4a7b0d7b6a4 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IFoo // Public signature: /IFoo|null[0] fun interface IFoo { - // CHECK: // Mangled name: IFoo#foo(kotlin.Int){} // Public signature: /IFoo.foo|-104159190164110731[0] @@ -15,7 +14,6 @@ fun interface IFoo { // Mangled name: IFoo2 // Public signature: /IFoo2|null[0] fun interface IFoo2 : IFoo { - // CHECK: // Mangled name: IFoo2#foo(kotlin.Int){} // Public signature: /IFoo2.foo|-104159190164110731[0] diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.sig.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.sig.kt.txt index 3c2bde17a4d..a46b886f2ff 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IFoo // Public signature: /IFoo|null[0] fun interface IFoo { - // CHECK: // Mangled name: IFoo#foo(kotlin.Int){} // Public signature: /IFoo.foo|-104159190164110731[0] diff --git a/compiler/testData/ir/irText/expressions/chainedFunSuspendConversionForSimpleExpression.sig.kt.txt b/compiler/testData/ir/irText/expressions/chainedFunSuspendConversionForSimpleExpression.sig.kt.txt index 22735041f79..cab0b7f9e65 100644 --- a/compiler/testData/ir/irText/expressions/chainedFunSuspendConversionForSimpleExpression.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/chainedFunSuspendConversionForSimpleExpression.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: SuspendRunnable // Public signature: /SuspendRunnable|null[0] fun interface SuspendRunnable { - // CHECK: // Mangled name: SuspendRunnable#invoke(){} // Public signature: /SuspendRunnable.invoke|-4663091332620260873[0] diff --git a/compiler/testData/ir/irText/expressions/conventionComparisons.fir.kt.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.fir.kt.txt index 8759cf24cc9..8779285fc21 100644 --- a/compiler/testData/ir/irText/expressions/conventionComparisons.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/conventionComparisons.fir.kt.txt @@ -1,5 +1,4 @@ interface IA { - } interface IB { diff --git a/compiler/testData/ir/irText/expressions/conventionComparisons.kt.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.kt.txt index 8759cf24cc9..8779285fc21 100644 --- a/compiler/testData/ir/irText/expressions/conventionComparisons.kt.txt +++ b/compiler/testData/ir/irText/expressions/conventionComparisons.kt.txt @@ -1,5 +1,4 @@ interface IA { - } interface IB { diff --git a/compiler/testData/ir/irText/expressions/conventionComparisons.sig.kt.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.sig.kt.txt index c070faac29d..09dc07a234d 100644 --- a/compiler/testData/ir/irText/expressions/conventionComparisons.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/conventionComparisons.sig.kt.txt @@ -2,14 +2,12 @@ // Mangled name: IA // Public signature: /IA|null[0] interface IA { - } // CHECK: // Mangled name: IB // Public signature: /IB|null[0] interface IB { - // CHECK JVM_IR: // Mangled name: IB#compareTo@IA(IA){}kotlin.Int // Public signature: /IB.compareTo|-7259969497814497426[0] diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.sig.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.sig.kt.txt index f92a94f8ae6..750b278667a 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.sig.kt.txt @@ -7,6 +7,7 @@ abstract enum class X : Enum { // Public signature: /X.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: X.B // Public signature: /X.B|null[0] @@ -51,6 +52,7 @@ abstract enum class X : Enum { // Public signature: /X.B..|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: X.B#compareTo(X){}kotlin.Int // Public signature: /X.B..compareTo|-4945307460605318887[0] diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.sig.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.sig.kt.txt index 18346697af2..bbcf25dad76 100644 --- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.sig.kt.txt @@ -7,6 +7,7 @@ enum class A : Enum { // Public signature: /A.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: A.V1 // Public signature: /A.V1|null[0] diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.sig.kt.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.sig.kt.txt index a24871b0930..b0b08e8163d 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.sig.kt.txt @@ -34,7 +34,6 @@ class IntCell { // Mangled name: IReceiver // Public signature: /IReceiver|null[0] interface IReceiver { - // CHECK JVM_IR: // Mangled name: IReceiver#hasNext@IntCell(){}kotlin.Boolean // Public signature: /IReceiver.hasNext|8807543829800046753[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/arrayAsVarargAfterSamArgument_fi.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/arrayAsVarargAfterSamArgument_fi.sig.kt.txt index 36c453dca79..fb26409d2be 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/arrayAsVarargAfterSamArgument_fi.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/arrayAsVarargAfterSamArgument_fi.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IRunnable // Public signature: /IRunnable|null[0] fun interface IRunnable { - // CHECK: // Mangled name: IRunnable#run(){} // Public signature: /IRunnable.run|-991178076551934874[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/basicFunInterfaceConversion.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/basicFunInterfaceConversion.sig.kt.txt index 77ce03b782b..86ea45737ed 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/basicFunInterfaceConversion.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/basicFunInterfaceConversion.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: Foo // Public signature: /Foo|null[0] fun interface Foo { - // CHECK JVM_IR: // Mangled name: Foo#invoke(){}kotlin.String // Public signature: /Foo.invoke|8861605044563078664[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/castFromAny.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/castFromAny.sig.kt.txt index 2681c6aaa25..fc4f4b2accc 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/castFromAny.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/castFromAny.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: KRunnable // Public signature: /KRunnable|null[0] fun interface KRunnable { - // CHECK: // Mangled name: KRunnable#invoke(){} // Public signature: /KRunnable.invoke|-4663091332620260873[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.kt.txt index 63837891b5a..cf236872615 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.kt.txt @@ -1,5 +1,4 @@ fun interface Foo : Function0 { - } fun id(foo: Foo): Any { diff --git a/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.sig.kt.txt index dab916192e2..605c902efa7 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/functionSupertype.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: Foo // Public signature: /Foo|null[0] fun interface Foo : Function0 { - // CHECK JVM_IR: // Mangled name: Foo#invoke(){}kotlin.Int // Public signature: /Foo.invoke|906964710558498066[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.sig.kt.txt index e3d1b71a8b8..56bd5b7e4d0 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.sig.kt.txt @@ -54,7 +54,6 @@ class J { // Mangled name: Fn // Public signature: /Fn|null[0] fun interface Fn { - // CHECK JVM_IR: // Mangled name: Fn#run(kotlin.String;kotlin.Int;1:0){}1:1 // Public signature: /Fn.run|6229634511602909233[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.sig.kt.txt index 4ff0ac20668..999c1a9c6d6 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IFoo // Public signature: /IFoo|null[0] fun interface IFoo { - // CHECK: // Mangled name: IFoo#foo(kotlin.Int){} // Public signature: /IFoo.foo|-104159190164110731[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargsMixed.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargsMixed.sig.kt.txt index c778f33a823..968b4532e95 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargsMixed.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargsMixed.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: MyRunnable // Public signature: /MyRunnable|null[0] fun interface MyRunnable { - // CHECK: // Mangled name: MyRunnable#run(){} // Public signature: /MyRunnable.run|-991178076551934874[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionOnCallableReference.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionOnCallableReference.sig.kt.txt index 230cc74a2ed..7439be62952 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionOnCallableReference.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionOnCallableReference.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: KRunnable // Public signature: /KRunnable|null[0] fun interface KRunnable { - // CHECK: // Mangled name: KRunnable#run(){} // Public signature: /KRunnable.run|-991178076551934874[0] diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.fir.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.fir.kt.txt index 92c1426616c..aa519312dbc 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.fir.kt.txt @@ -83,7 +83,6 @@ fun test7b(a: T) where T : Function1, T : Function0 { } interface Unrelated { - } fun test7c(a: T) where T : Unrelated, T : Function0 { diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.kt.txt index f6f23ec1a52..84fbd888a6d 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.kt.txt @@ -83,7 +83,6 @@ fun test7b(a: T) where T : Function1, T : Function0 { } interface Unrelated { - } fun test7c(a: T) where T : Unrelated, T : Function0 { diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.sig.kt.txt index 3f00efa8622..817d0a41186 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionsWithSmartCasts.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: KRunnable // Public signature: /KRunnable|null[0] fun interface KRunnable { - // CHECK: // Mangled name: KRunnable#run(){} // Public signature: /KRunnable.run|-991178076551934874[0] @@ -15,7 +14,6 @@ fun interface KRunnable { // Mangled name: Unrelated // Public signature: /Unrelated|null[0] interface Unrelated { - } // CHECK JVM_IR: diff --git a/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.sig.kt.txt b/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.sig.kt.txt index ace3af428eb..0d3082df6cb 100644 --- a/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: KConsumer // Public signature: /KConsumer|null[0] fun interface KConsumer { - // CHECK: // Mangled name: KConsumer#accept(1:0){} // Public signature: /KConsumer.accept|6106307687017385176[0] @@ -15,7 +14,6 @@ fun interface KConsumer { // Mangled name: KRunnable // Public signature: /KRunnable|null[0] fun interface KRunnable { - // CHECK: // Mangled name: KRunnable#run(){} // Public signature: /KRunnable.run|-991178076551934874[0] @@ -28,7 +26,6 @@ fun interface KRunnable { // Mangled name: KSupplier // Public signature: /KSupplier|null[0] fun interface KSupplier { - // CHECK JVM_IR: // Mangled name: KSupplier#get(){}1:0 // Public signature: /KSupplier.get|-8285253024618084508[0] diff --git a/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.sig.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.sig.kt.txt index be6a7d85ff1..88e1e89f261 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.sig.kt.txt @@ -7,6 +7,7 @@ class C { // Public signature: /C.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK: // Mangled name: C#(kotlin.Any?){} // Public signature: /C.|-8205545948568413246[0] diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.kt.txt index 0a88b204020..6a69da27a94 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.kt.txt @@ -6,7 +6,6 @@ inline fun Any.test1(): T? { } interface Foo { - } val Foo.asT: T? diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt index dfac84eac5d..845cfadcb16 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt @@ -6,7 +6,6 @@ inline fun Any.test1(): T? { } interface Foo { - } val Foo.asT: T? diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.sig.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.sig.kt.txt index be1b4d6fb07..b302efa6e3d 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.sig.kt.txt @@ -26,7 +26,6 @@ class Bar { // Mangled name: Foo // Public signature: /Foo|null[0] interface Foo { - } // CHECK JVM_IR: diff --git a/compiler/testData/ir/irText/expressions/interfaceThisRef.sig.kt.txt b/compiler/testData/ir/irText/expressions/interfaceThisRef.sig.kt.txt index 20ce9e411a0..31efb1c8cf8 100644 --- a/compiler/testData/ir/irText/expressions/interfaceThisRef.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/interfaceThisRef.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IFoo // Public signature: /IFoo|null[0] interface IFoo { - // CHECK: // Mangled name: IFoo#bar(){} // Public signature: /IFoo.bar|496682602797471549[0] diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt index b8bd90a7cb8..56a079ed1f7 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.kt.txt @@ -1,5 +1,4 @@ interface IFoo { - } class Derived1 : JFieldOwner, IFoo { diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt index 37ac60fbc45..5f5ad0b7736 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.kt.txt @@ -1,5 +1,4 @@ interface IFoo { - } class Derived1 : JFieldOwner, IFoo { diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.sig.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.sig.kt.txt index 063d41ce671..3d8738de3de 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.sig.kt.txt @@ -62,7 +62,6 @@ open class Mid : JFieldOwner { // Mangled name: IFoo // Public signature: /IFoo|null[0] interface IFoo { - } // CHECK: diff --git a/compiler/testData/ir/irText/expressions/kt30020.sig.kt.txt b/compiler/testData/ir/irText/expressions/kt30020.sig.kt.txt index 98c486bc84d..5712174adc8 100644 --- a/compiler/testData/ir/irText/expressions/kt30020.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/kt30020.sig.kt.txt @@ -25,6 +25,7 @@ abstract class AML : MutableList { // Public signature: /AML.|-5645683436151566731[0] // Public signature debug description: (){} constructor() /* primary */ + // CHECK JVM_IR: // Mangled name: AML#add(kotlin.Int){}kotlin.Boolean // Public signature: /AML.add|-1806173376318726841[0] @@ -244,7 +245,6 @@ abstract class AML : MutableList { // Mangled name: X // Public signature: /X|null[0] interface X { - // CHECK JVM_IR: // Mangled name: X#f(){}kotlin.collections.MutableList // Public signature: /X.f|7644118277748321581[0] diff --git a/compiler/testData/ir/irText/expressions/kt35730.sig.kt.txt b/compiler/testData/ir/irText/expressions/kt35730.sig.kt.txt index fd1e8848d3c..1ecb53ffa2f 100644 --- a/compiler/testData/ir/irText/expressions/kt35730.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/kt35730.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: Base // Public signature: /Base|null[0] interface Base { - // CHECK: // Mangled name: Base#foo(){} // Public signature: /Base.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/expressions/kt47082.kt.txt b/compiler/testData/ir/irText/expressions/kt47082.kt.txt index 05f9d36f9b2..e346fa5e0ef 100644 --- a/compiler/testData/ir/irText/expressions/kt47082.kt.txt +++ b/compiler/testData/ir/irText/expressions/kt47082.kt.txt @@ -3,15 +3,12 @@ fun produce(block: @ExtensionFunctionType Function1, Unit> } interface Derived : Base { - } interface Base { - } interface Receiver { - } fun > Receiver.toChannel(destination: C): C { diff --git a/compiler/testData/ir/irText/expressions/kt47082.sig.kt.txt b/compiler/testData/ir/irText/expressions/kt47082.sig.kt.txt index f2e04cdd635..849cf24e742 100644 --- a/compiler/testData/ir/irText/expressions/kt47082.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/kt47082.sig.kt.txt @@ -2,21 +2,18 @@ // Mangled name: Base // Public signature: /Base|null[0] interface Base { - } // CHECK: // Mangled name: Derived // Public signature: /Derived|null[0] interface Derived : Base { - } // CHECK: // Mangled name: Receiver // Public signature: /Receiver|null[0] interface Receiver { - } // CHECK JVM_IR: diff --git a/compiler/testData/ir/irText/expressions/kt47328.sig.kt.txt b/compiler/testData/ir/irText/expressions/kt47328.sig.kt.txt index ebcfdeabe9e..4ee1c915622 100644 --- a/compiler/testData/ir/irText/expressions/kt47328.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/kt47328.sig.kt.txt @@ -71,7 +71,6 @@ class E { // Mangled name: A // Public signature: /A|null[0] interface A { - // CHECK: // Mangled name: A{}x // Public signature: /A.x|-8060530855978347579[0] diff --git a/compiler/testData/ir/irText/expressions/multipleSmartCasts.sig.kt.txt b/compiler/testData/ir/irText/expressions/multipleSmartCasts.sig.kt.txt index 02eb6eba98c..c5af20f203d 100644 --- a/compiler/testData/ir/irText/expressions/multipleSmartCasts.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/multipleSmartCasts.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IC1 // Public signature: /IC1|null[0] interface IC1 { - // CHECK JVM_IR: // Mangled name: IC1#component1(){}kotlin.Int // Public signature: /IC1.component1|-8217597213800111288[0] @@ -19,7 +18,6 @@ interface IC1 { // Mangled name: IC2 // Public signature: /IC2|null[0] interface IC2 { - // CHECK JVM_IR: // Mangled name: IC2#component2(){}kotlin.String // Public signature: /IC2.component2|1228864375093914597[0] diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.sig.kt.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.sig.kt.txt index 5ce029bffff..ff9bf7bbe07 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.sig.kt.txt @@ -37,6 +37,7 @@ enum class En : Enum { // Public signature: /En.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: En.X // Public signature: /En.X|null[0] diff --git a/compiler/testData/ir/irText/expressions/safeCalls.sig.kt.txt b/compiler/testData/ir/irText/expressions/safeCalls.sig.kt.txt index b2aa22f6738..7cebe2bfdeb 100644 --- a/compiler/testData/ir/irText/expressions/safeCalls.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/safeCalls.sig.kt.txt @@ -34,7 +34,6 @@ class Ref { // Mangled name: IHost // Public signature: /IHost|null[0] interface IHost { - // CHECK JVM_IR: // Mangled name: IHost#extLength@kotlin.String(){}kotlin.Int // Public signature: /IHost.extLength|-6119453020131348069[0] diff --git a/compiler/testData/ir/irText/expressions/smartCastAside.sig.kt.txt b/compiler/testData/ir/irText/expressions/smartCastAside.sig.kt.txt index 20d65313b40..6e6ddc63d50 100644 --- a/compiler/testData/ir/irText/expressions/smartCastAside.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/smartCastAside.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: A // Public signature: /A|null[0] interface A { - // CHECK: // Mangled name: A#foo(){} // Public signature: /A.foo|-1041209573719867811[0] @@ -15,7 +14,6 @@ interface A { // Mangled name: B // Public signature: /B|null[0] interface B : A { - // CHECK: // Mangled name: B#foo(){} // Public signature: /B.foo|-1041209573719867811[0] @@ -34,7 +32,6 @@ interface B : A { // Mangled name: C // Public signature: /C|null[0] interface C : A { - // CHECK: // Mangled name: C#foo(){} // Public signature: /C.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/expressions/smartCastAside2.sig.kt.txt b/compiler/testData/ir/irText/expressions/smartCastAside2.sig.kt.txt index 3650e5db5cb..3042a8e9410 100644 --- a/compiler/testData/ir/irText/expressions/smartCastAside2.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/smartCastAside2.sig.kt.txt @@ -20,7 +20,6 @@ abstract class Bar { // Mangled name: Foo // Public signature: /Foo|null[0] interface Foo { - // CHECK: // Mangled name: Foo#foo(){} // Public signature: /Foo.foo|-1041209573719867811[0] diff --git a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.kt.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.kt.txt index 37e99655dd8..53760001b03 100644 --- a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.kt.txt @@ -1,9 +1,7 @@ interface I1 { - } interface I2 { - } operator fun I1.component1(): Int { diff --git a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt.txt index b1a9c111927..e2f0b2e5283 100644 --- a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt.txt +++ b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.kt.txt @@ -1,9 +1,7 @@ interface I1 { - } interface I2 { - } operator fun I1.component1(): Int { diff --git a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.sig.kt.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.sig.kt.txt index f9c5118186c..b764b1a9400 100644 --- a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.sig.kt.txt @@ -2,14 +2,12 @@ // Mangled name: I1 // Public signature: /I1|null[0] interface I1 { - } // CHECK: // Mangled name: I2 // Public signature: /I2|null[0] interface I2 { - } // CHECK JVM_IR: diff --git a/compiler/testData/ir/irText/expressions/suspendConversionWithFunInterfaces.sig.kt.txt b/compiler/testData/ir/irText/expressions/suspendConversionWithFunInterfaces.sig.kt.txt index 4f82c87239f..5cb938beaa2 100644 --- a/compiler/testData/ir/irText/expressions/suspendConversionWithFunInterfaces.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/suspendConversionWithFunInterfaces.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: SuspendRunnable // Public signature: /SuspendRunnable|null[0] fun interface SuspendRunnable { - // CHECK: // Mangled name: SuspendRunnable#invoke(){} // Public signature: /SuspendRunnable.invoke|-4663091332620260873[0] diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.sig.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.sig.kt.txt index b4cd22821b0..774f17d8a81 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.sig.kt.txt @@ -37,6 +37,7 @@ enum class En : Enum { // Public signature: /En.|392868513202821770[0] // Public signature debug description: (kotlin.String?){} private constructor(x: String?) /* primary */ + // CHECK: // Mangled name: En.ENTRY // Public signature: /En.ENTRY|null[0] diff --git a/compiler/testData/ir/irText/expressions/typeOperators.kt.txt b/compiler/testData/ir/irText/expressions/typeOperators.kt.txt index 8eabd35e681..30f8dc76ad7 100644 --- a/compiler/testData/ir/irText/expressions/typeOperators.kt.txt +++ b/compiler/testData/ir/irText/expressions/typeOperators.kt.txt @@ -1,5 +1,4 @@ interface IThing { - } fun test1(x: Any): Boolean { diff --git a/compiler/testData/ir/irText/expressions/typeOperators.sig.kt.txt b/compiler/testData/ir/irText/expressions/typeOperators.sig.kt.txt index c52f3ee26de..b9a05f23188 100644 --- a/compiler/testData/ir/irText/expressions/typeOperators.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/typeOperators.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: IThing // Public signature: /IThing|null[0] interface IThing { - } // CHECK JVM_IR: diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.sig.kt.txt b/compiler/testData/ir/irText/expressions/useImportedMember.sig.kt.txt index 48670cdf155..3b1283885ed 100644 --- a/compiler/testData/ir/irText/expressions/useImportedMember.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/useImportedMember.sig.kt.txt @@ -29,7 +29,6 @@ open class BaseClass { // Mangled name: I // Public signature: /I|null[0] interface I { - // CHECK JVM_IR: // Mangled name: I#fromInterface@0:0(){0ยง}0:0 // Public signature: /I.fromInterface|-4942486396992795009[0] diff --git a/compiler/testData/ir/irText/expressions/values.sig.kt.txt b/compiler/testData/ir/irText/expressions/values.sig.kt.txt index 6a859171fe4..4c3a869d3d6 100644 --- a/compiler/testData/ir/irText/expressions/values.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/values.sig.kt.txt @@ -46,6 +46,7 @@ enum class Enum : Enum { // Public signature: /Enum.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: Enum.A // Public signature: /Enum.A|null[0] diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.sig.kt.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.sig.kt.txt index f36b7a468ed..e1bffb843c6 100644 --- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.sig.kt.txt +++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.sig.kt.txt @@ -7,6 +7,7 @@ enum class En : Enum { // Public signature: /En.|-5645683436151566731[0] // Public signature debug description: (){} private constructor() /* primary */ + // CHECK: // Mangled name: En.A // Public signature: /En.A|null[0] diff --git a/compiler/testData/ir/irText/firProblems/AnnotationLoader.sig.kt.txt b/compiler/testData/ir/irText/firProblems/AnnotationLoader.sig.kt.txt index 84b774ca1ad..ed7d57d83a7 100644 --- a/compiler/testData/ir/irText/firProblems/AnnotationLoader.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/AnnotationLoader.sig.kt.txt @@ -24,7 +24,6 @@ class AnnotationLoader { // Mangled name: Visitor // Public signature: /Visitor|null[0] interface Visitor { - // CHECK: // Mangled name: Visitor#visit(){} // Public signature: /Visitor.visit|-7531698844362190050[0] diff --git a/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.kt.txt b/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.kt.txt index 3ba94b42dee..604cbbcc8f7 100644 --- a/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.kt.txt +++ b/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.kt.txt @@ -1,5 +1,4 @@ interface NestedGroupFragment { - } private fun addMavenOptionsGroupFragment(): { diff --git a/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.sig.kt.txt b/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.sig.kt.txt index 7757ea04a9a..0b5bd1d758b 100644 --- a/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/AnonymousAsReturnOfGenericFunction.sig.kt.txt @@ -2,7 +2,6 @@ // Mangled name: NestedGroupFragment // Public signature: /NestedGroupFragment|null[0] interface NestedGroupFragment { - } // CHECK JVM_IR: diff --git a/compiler/testData/ir/irText/firProblems/ArrayMap.sig.kt.txt b/compiler/testData/ir/irText/firProblems/ArrayMap.sig.kt.txt index 7f65bada16a..9feb476b9b3 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayMap.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayMap.sig.kt.txt @@ -144,6 +144,7 @@ internal class ArrayMapImpl : ArrayMap { // Public signature: /ArrayMapImpl.Entry.|437318787564761214[0] // Public signature debug description: (kotlin.Int;1:0){} constructor(key: Int, value: T) /* primary */ + // CHECK JVM_IR: // Mangled name: ArrayMapImpl.Entry#component1(){}kotlin.Int // Public signature: /ArrayMapImpl.Entry.component1|-8217597213800111288[0] @@ -253,6 +254,7 @@ internal class ArrayMapImpl : ArrayMap { // Public signature: /ArrayMapImpl.|-940489726603364367[0] // Public signature debug description: (kotlin.Array){} private constructor(data: Array) /* primary */ + // CHECK: // Mangled name: ArrayMapImpl#(){} // Public signature: /ArrayMapImpl.|-5645683436151566731[0] diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.kt.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.kt.txt index 2290839aaee..ccdec7208a0 100644 --- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.fir.kt.txt @@ -1,13 +1,10 @@ interface ComponentContainer { - } interface PlatformSpecificExtension> { - } interface ComponentDescriptor { - } abstract class PlatformExtensionsClashResolver> { diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt index 8d381b7472c..0249a047a1f 100644 --- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt @@ -1,13 +1,10 @@ interface ComponentContainer { - } interface PlatformSpecificExtension> { - } interface ComponentDescriptor { - } abstract class PlatformExtensionsClashResolver> { diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.sig.kt.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.sig.kt.txt index 1baf15e34e9..e374fdfef5b 100644 --- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.sig.kt.txt @@ -68,21 +68,18 @@ abstract class PlatformExtensionsClashResolver> // Mangled name: ComponentContainer // Public signature: /ComponentContainer|null[0] interface ComponentContainer { - } // CHECK: // Mangled name: ComponentDescriptor // Public signature: /ComponentDescriptor|null[0] interface ComponentDescriptor { - } // CHECK: // Mangled name: PlatformSpecificExtension // Public signature: /PlatformSpecificExtension|null[0] interface PlatformSpecificExtension> { - } // CHECK: diff --git a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.fir.kt.txt b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.fir.kt.txt index 8e87b413755..0eca7026446 100644 --- a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.fir.kt.txt @@ -1,5 +1,4 @@ interface IrType { - } interface TypeRemapper { @@ -19,7 +18,6 @@ interface IrTypeParametersContainer : IrDeclaration, IrDeclarationParent { } interface IrDeclaration { - } interface IrTypeParameter : IrDeclaration { @@ -29,7 +27,6 @@ interface IrTypeParameter : IrDeclaration { } interface IrDeclarationParent { - } class DeepCopyIrTreeWithSymbols { diff --git a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt index c09c4d538f1..3d4aa9f2ef6 100644 --- a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt +++ b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.kt.txt @@ -1,5 +1,4 @@ interface IrType { - } interface TypeRemapper { @@ -19,7 +18,6 @@ interface IrTypeParametersContainer : IrDeclaration, IrDeclarationParent { } interface IrDeclaration { - } interface IrTypeParameter : IrDeclaration { @@ -29,7 +27,6 @@ interface IrTypeParameter : IrDeclaration { } interface IrDeclarationParent { - } class DeepCopyIrTreeWithSymbols { diff --git a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.sig.kt.txt b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.sig.kt.txt index 84ec5162db7..96cc1fac761 100644 --- a/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/DeepCopyIrTree.sig.kt.txt @@ -45,28 +45,24 @@ class DeepCopyIrTreeWithSymbols { // Mangled name: IrDeclaration // Public signature: /IrDeclaration|null[0] interface IrDeclaration { - } // CHECK: // Mangled name: IrDeclarationParent // Public signature: /IrDeclarationParent|null[0] interface IrDeclarationParent { - } // CHECK: // Mangled name: IrType // Public signature: /IrType|null[0] interface IrType { - } // CHECK: // Mangled name: IrTypeParameter // Public signature: /IrTypeParameter|null[0] interface IrTypeParameter : IrDeclaration { - // CHECK: // Mangled name: IrTypeParameter{}superTypes // Public signature: /IrTypeParameter.superTypes|4746750561425700979[0] @@ -88,7 +84,6 @@ interface IrTypeParameter : IrDeclaration { // Mangled name: IrTypeParametersContainer // Public signature: /IrTypeParametersContainer|null[0] interface IrTypeParametersContainer : IrDeclaration, IrDeclarationParent { - // CHECK: // Mangled name: IrTypeParametersContainer{}typeParameters // Public signature: /IrTypeParametersContainer.typeParameters|551746886075737521[0] @@ -115,7 +110,6 @@ interface IrTypeParametersContainer : IrDeclaration, IrDeclarationParent { // Mangled name: TypeRemapper // Public signature: /TypeRemapper|null[0] interface TypeRemapper { - // CHECK: // Mangled name: TypeRemapper#enterScope(IrTypeParametersContainer){} // Public signature: /TypeRemapper.enterScope|1651098445614641728[0] diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.sig.kt.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.sig.kt.txt index bb48414d6ae..5ac22acaed2 100644 --- a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.sig.kt.txt @@ -7,6 +7,7 @@ class Impl : A, B { // Public signature: /Impl.|1084968671839233134[0] // Public signature debug description: (Foo.B){} constructor(b: B) /* primary */ + // CHECK JVM_IR: // Mangled name: Impl#add(kotlin.String?){}kotlin.Boolean // Public signature: /Impl.add|-2525808668243873976[0] diff --git a/compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.sig.kt.txt b/compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.sig.kt.txt index bda290bb7f8..27e12a80373 100644 --- a/compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ErrorInDefaultValue.sig.kt.txt @@ -44,6 +44,7 @@ class C : A { // Public signature: /C.|-3166999336802030902[0] // Public signature debug description: (A){} constructor(x: A) /* primary */ + // CHECK JVM_IR: // Mangled name: C#f(kotlin.String){}kotlin.String // Public signature: /C.f|-2199490409267413998[0] @@ -60,7 +61,6 @@ class C : A { // Mangled name: A // Public signature: /A|null[0] interface A { - // CHECK JVM_IR: // Mangled name: A#f(kotlin.String){}kotlin.String // Public signature: /A.f|-2199490409267413998[0] diff --git a/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.sig.kt.txt b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.sig.kt.txt index ce0a42eb612..a73c4885481 100644 --- a/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/FakeOverrideInAnonymousWithDelegation.sig.kt.txt @@ -46,7 +46,6 @@ class Wrapper { // Mangled name: Bar // Public signature: /Bar|null[0] interface Bar { - // CHECK: // Mangled name: Bar{}foo // Public signature: /Bar.foo|1688079488202778848[0] diff --git a/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.sig.kt.txt b/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.sig.kt.txt index 499ef8cea68..5e5bf9d947f 100644 --- a/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/Fir2IrClassifierStorage.sig.kt.txt @@ -148,7 +148,6 @@ class FirSession { // Mangled name: Fir2IrComponents // Public signature: /Fir2IrComponents|null[0] interface Fir2IrComponents { - // CHECK: // Mangled name: Fir2IrComponents{}classifierStorage // Public signature: /Fir2IrComponents.classifierStorage|-9190759179670631614[0] diff --git a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt index e23a427a620..026b49f0708 100644 --- a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt @@ -1,9 +1,7 @@ interface SymbolOwner> { - } interface Symbol> { - } interface ReceiverValue { diff --git a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt.txt b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt.txt index e23a427a620..026b49f0708 100644 --- a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt.txt @@ -1,9 +1,7 @@ interface SymbolOwner> { - } interface Symbol> { - } interface ReceiverValue { diff --git a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.sig.kt.txt b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.sig.kt.txt index 8c4e1af0ca5..899356cbae8 100644 --- a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.sig.kt.txt @@ -152,7 +152,6 @@ class PersistentImplicitReceiverStack : ImplicitReceiverStack, Iterable> { - } // CHECK: // Mangled name: SymbolOwner // Public signature: /SymbolOwner|null[0] interface SymbolOwner> { - } // CHECK: diff --git a/compiler/testData/ir/irText/firProblems/Modality.kt.txt b/compiler/testData/ir/irText/firProblems/Modality.kt.txt index 2da7a288f9f..c322a4d8fc7 100644 --- a/compiler/testData/ir/irText/firProblems/Modality.kt.txt +++ b/compiler/testData/ir/irText/firProblems/Modality.kt.txt @@ -1,5 +1,4 @@ interface Substitutable { - } abstract class ResolutionPart { diff --git a/compiler/testData/ir/irText/firProblems/Modality.sig.kt.txt b/compiler/testData/ir/irText/firProblems/Modality.sig.kt.txt index 40a80342cca..46ee9a28bf6 100644 --- a/compiler/testData/ir/irText/firProblems/Modality.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/Modality.sig.kt.txt @@ -66,7 +66,6 @@ abstract class ResolutionPart { // Mangled name: Substitutable // Public signature: /Substitutable|null[0] interface Substitutable { - } // CHECK: diff --git a/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt b/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt index f6ee232fa94..3ab6c0280f6 100644 --- a/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt @@ -45,7 +45,6 @@ data class Some { } interface MyList : List> { - } open class SomeList : MyList, ArrayList> { diff --git a/compiler/testData/ir/irText/firProblems/MultiList.kt.txt b/compiler/testData/ir/irText/firProblems/MultiList.kt.txt index e3ac58d0295..0a68081ef25 100644 --- a/compiler/testData/ir/irText/firProblems/MultiList.kt.txt +++ b/compiler/testData/ir/irText/firProblems/MultiList.kt.txt @@ -45,7 +45,6 @@ data class Some { } interface MyList : List> { - } open class SomeList : MyList, ArrayList> { diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt index b8ebca548b0..f938311fd47 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt @@ -17,7 +17,6 @@ object Factory { } interface Base { - } interface Delegate : Base { @@ -26,7 +25,6 @@ interface Delegate : Base { } interface Derived : Delegate { - } data class DataClass : Derived, Delegate { diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt index 159ca53fa30..9983ad70290 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt @@ -17,7 +17,6 @@ object Factory { } interface Base { - } interface Delegate : Base { @@ -26,7 +25,6 @@ interface Delegate : Base { } interface Derived : Delegate { - } data class DataClass : Derived, Delegate { diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.sig.kt.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.sig.kt.txt index 848f38e38d4..372c0501d94 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.sig.kt.txt @@ -22,6 +22,7 @@ data class DataClass : Delegate, Derived { // Public signature: /DataClass.|7426992287025160657[0] // Public signature debug description: (Delegate){} constructor(delegate: Delegate) /* primary */ + // CHECK: // Mangled name: DataClass#bar(){} // Public signature: /DataClass.bar|496682602797471549[0] @@ -84,14 +85,12 @@ data class DataClass : Delegate, Derived { // Mangled name: Base // Public signature: /Base|null[0] interface Base { - } // CHECK: // Mangled name: Delegate // Public signature: /Delegate|null[0] interface Delegate : Base { - // CHECK: // Mangled name: Delegate#bar(){} // Public signature: /Delegate.bar|496682602797471549[0] diff --git a/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.kt.txt b/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.kt.txt index aa4f60b37e8..8c7093c7341 100644 --- a/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.kt.txt @@ -1,5 +1,4 @@ interface SimpleTypeMarker { - } class SimpleType : SimpleTypeMarker { diff --git a/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.sig.kt.txt b/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.sig.kt.txt index 6a0747df978..e4375e64766 100644 --- a/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SimpleTypeMarker.sig.kt.txt @@ -46,14 +46,12 @@ class UserImpl { // Mangled name: SimpleTypeMarker // Public signature: /SimpleTypeMarker|null[0] interface SimpleTypeMarker { - } // CHECK: // Mangled name: User // Public signature: /User|null[0] interface User { - // CHECK JVM_IR: // Mangled name: User#bar@SimpleTypeMarker(){}kotlin.String // Public signature: /User.bar|9149645946452319977[0] diff --git a/compiler/testData/ir/irText/firProblems/TypeParameterBounds.kt.txt b/compiler/testData/ir/irText/firProblems/TypeParameterBounds.kt.txt index 59db3f311af..37b25382ef6 100644 --- a/compiler/testData/ir/irText/firProblems/TypeParameterBounds.kt.txt +++ b/compiler/testData/ir/irText/firProblems/TypeParameterBounds.kt.txt @@ -34,7 +34,6 @@ open annotation class TypeParameterAnnBinary : Annotation { } interface Simple { - } class SimpleClass { @@ -47,7 +46,6 @@ class SimpleClass { } interface Generic { - } class GenericClass { diff --git a/compiler/testData/ir/irText/firProblems/TypeParameterBounds.sig.kt.txt b/compiler/testData/ir/irText/firProblems/TypeParameterBounds.sig.kt.txt index d96d6b3b31d..90d178cfac0 100644 --- a/compiler/testData/ir/irText/firProblems/TypeParameterBounds.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/TypeParameterBounds.sig.kt.txt @@ -153,13 +153,11 @@ class TypeParameterAsBound