From 968dfddbc9c839571983a774c0de678008799f8c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 1 Nov 2023 16:19:42 +0100 Subject: [PATCH] Tests: adjust test data for bytecode listing tests - remove obsolete `IGNORE_BACKEND: JVM` directives - move contents of .ir.txt files to the corresponding .txt --- ...rProtectedPropertyWithPrivateSetter.ir.txt | 43 --- ...rForProtectedPropertyWithPrivateSetter.txt | 7 +- ...rtyWithPrivateSetterInObjectLiteral.ir.txt | 42 --- ...opertyWithPrivateSetterInObjectLiteral.txt | 7 +- .../accessorForTopLevelMembers.ir.txt | 16 -- .../accessorForTopLevelMembers.txt | 2 +- ...tectedStaticJavaFieldInOtherPackage.ir.txt | 44 ---- ...ProtectedStaticJavaFieldInOtherPackage.txt | 7 +- .../annotationCtorCallGenerateSynthetic.kt | 3 +- .../bytecodeListing/annotations/kt9320.ir.txt | 50 ---- .../bytecodeListing/annotations/kt9320.txt | 2 +- .../annotations/literals.ir.txt | 83 ------ .../bytecodeListing/annotations/literals.txt | 6 +- .../localClassWithCapturedParams.ir.txt | 25 -- .../localClassWithCapturedParams.txt | 7 +- .../callableReference/adaptedReference.ir.txt | 34 --- .../callableReference/adaptedReference.txt | 11 +- .../collectionStubs/ListAndSet.ir.txt | 32 --- .../collectionStubs/ListAndSet.txt | 6 +- .../abstractMapRedefiningGetAny.ir.txt | 24 -- .../abstractMapRedefiningGetAny.txt | 6 +- .../byteShortMap.ir.txt | 27 -- .../abstractStubSignatures/byteShortMap.txt | 9 +- .../byteShortMutableMap.ir.txt | 24 -- .../byteShortMutableMap.txt | 7 +- .../abstractStubSignatures/collection.ir.txt | 39 --- .../abstractStubSignatures/collection.txt | 4 +- .../genericCollection.ir.txt | 16 -- .../genericCollection.txt | 1 - .../abstractStubSignatures/genericMap.ir.txt | 18 -- .../abstractStubSignatures/genericMap.txt | 4 +- .../genericMutableCollection.ir.txt | 9 - .../genericMutableCollection.txt | 2 - .../genericMutableList.ir.txt | 11 - .../genericMutableList.txt | 4 - .../genericMutableMap.ir.txt | 14 - .../genericMutableMap.txt | 5 +- .../genericStringMap.ir.txt | 23 -- .../genericStringMap.txt | 10 +- .../genericStringMutableMap.ir.txt | 18 -- .../genericStringMutableMap.txt | 8 +- .../abstractStubSignatures/list.ir.txt | 88 ------- .../abstractStubSignatures/list.txt | 19 +- .../listIterator.ir.txt | 38 --- .../abstractStubSignatures/listIterator.txt | 12 +- .../abstractStubSignatures/mapEntry.ir.txt | 42 --- .../abstractStubSignatures/mapEntry.txt | 11 +- .../mutableMapEntry.ir.txt | 34 --- .../mutableMapEntry.txt | 5 + .../numberStringMap.ir.txt | 27 -- .../numberStringMap.txt | 9 +- .../numberStringMutableMap.ir.txt | 24 -- .../numberStringMutableMap.txt | 7 +- .../abstractStubSignatures/set.ir.txt | 56 ---- .../abstractStubSignatures/set.txt | 5 +- .../specializedGenericMap.ir.txt | 31 --- .../specializedGenericMap.txt | 10 +- .../stringGenericMap.ir.txt | 23 -- .../stringGenericMap.txt | 4 +- .../stringGenericMutableMap.ir.txt | 20 -- .../stringGenericMutableMap.txt | 2 +- .../collectionByDelegation.ir.txt | 183 ------------- .../collectionByDelegation.txt | 2 + .../collectionByDelegation2.ir.txt | 213 --------------- .../collectionByDelegation2.txt | 32 ++- .../collectionByDelegation2WithFullJdk.ir.txt | 234 ----------------- .../collectionByDelegation2WithFullJdk.txt | 46 ++-- .../collectionByDelegation3.ir.txt | 213 --------------- .../collectionByDelegation3.txt | 32 ++- .../collectionByDelegation3WithFullJdk.ir.txt | 234 ----------------- .../collectionByDelegation3WithFullJdk.txt | 46 ++-- .../collectionByDelegationWithFullJdk.ir.txt | 197 -------------- .../collectionByDelegationWithFullJdk.txt | 2 + .../collectionWithInternalRemove.ir.txt | 20 -- .../collectionWithInternalRemove.txt | 1 + .../collectionsWithFullJdk.ir.txt | 156 ----------- .../collectionsWithFullJdk.txt | 44 ++-- .../collectionStubs/emptyList.ir.txt | 42 --- .../collectionStubs/emptyList.txt | 8 +- .../extendingAbstractCollection.ir.txt | 22 -- .../extendingAbstractCollection.txt | 1 - .../inheritingFromAbstractMap.ir.txt | 28 -- .../inheritingFromAbstractMap.txt | 9 +- .../inheritingFromAbstractMutableList.ir.txt | 33 --- .../inheritingFromAbstractMutableList.txt | 2 + .../collectionStubs/intArrayList.ir.txt | 18 -- .../collectionStubs/intArrayList.txt | 1 + .../collectionStubs/kt44233.ir.txt | 15 -- .../collectionStubs/kt44233.txt | 4 +- .../mapOfPrimitivesFullJdk.ir.txt | 43 --- .../mapOfPrimitivesFullJdk.txt | 23 +- .../noStubsForMapImplementations.ir.txt | 47 ---- .../noStubsForMapImplementations.txt | 10 +- .../observableMutableMap.ir.txt | 23 -- .../collectionStubs/observableMutableMap.txt | 4 +- .../stubForAbstractFunInAbstractClass.ir.txt | 26 -- .../stubForAbstractFunInAbstractClass.txt | 2 +- ...nAbstractClassWithCovariantOverride.ir.txt | 27 -- ...unInAbstractClassWithCovariantOverride.txt | 3 +- .../stubsFromSuperclassNoBridges.ir.txt | 49 ---- .../stubsFromSuperclassNoBridges.txt | 6 +- .../toArray/customNonGenericToArray.ir.txt | 63 ----- .../toArray/customNonGenericToArray.txt | 7 +- .../toArray/internalGenericToArray.ir.txt | 21 -- .../toArray/internalGenericToArray.txt | 1 + .../toArray/noToArrayInJava.ir.txt | 21 -- .../toArray/noToArrayInJava.txt | 1 - .../companionObjectVisibility_after.ir.txt | 67 ----- .../companionObjectVisibility_after.txt | 2 +- .../coroutineContextIntrinsic.ir.txt | 21 -- .../coroutines/coroutineContextIntrinsic.txt | 2 +- .../coroutines/coroutineFields.ir.txt | 66 ----- .../coroutines/coroutineFields.txt | 13 +- .../coroutines/oomInReturnUnit.ir.txt | 20 -- .../coroutines/oomInReturnUnit.txt | 2 +- .../coroutines/privateAccessor.ir.txt | 7 - .../coroutines/privateAccessor.txt | 1 + .../coroutines/privateSuspendFun.ir.txt | 14 - .../coroutines/privateSuspendFun.txt | 6 +- .../spilling/booleanParameter.ir.txt | 42 --- .../coroutines/spilling/booleanParameter.txt | 18 +- .../coroutines/spilling/component1.ir.txt | 42 --- .../coroutines/spilling/component1.txt | 7 +- .../coroutines/spilling/destructured.kt | 1 - .../coroutines/spilling/field.ir.txt | 42 --- .../coroutines/spilling/field.txt | 7 +- .../coroutines/spilling/lambda.kt | 1 - .../coroutines/spilling/select.kt | 1 - .../coroutines/spilling/unreachable.kt | 1 - .../coroutines/suspendConversion.ir.txt | 20 -- .../coroutines/suspendConversion.txt | 14 + .../coroutines/suspendImpl.ir.txt | 11 - .../coroutines/suspendImpl.txt | 12 +- .../coroutines/tcoContinuation.ir.txt | 234 ----------------- .../coroutines/tcoContinuation.txt | 233 +++-------------- .../delegateMethodIsNonOverridable.ir.txt | 53 ---- .../delegateMethodIsNonOverridable.txt | 36 +-- ...elegatedPropertiesInCompanionObject.ir.txt | 74 ------ .../delegatedPropertiesInCompanionObject.txt | 8 +- .../localDelegatedProperty.ir.txt | 12 - .../localDelegatedProperty.txt | 14 +- .../deprecatedEnumEntryFields.ir.txt | 15 -- .../deprecated/deprecatedEnumEntryFields.txt | 3 + .../deprecated/inheritingDeprecation.ir.txt | 84 ------ .../deprecated/inheritingDeprecation.txt | 3 + ...dConstantPropertyInterfaceCompanion.ir.txt | 38 --- ...atedConstantPropertyInterfaceCompanion.txt | 2 +- .../deserializeLambdaMethod.kt | 2 - .../codegen/bytecodeListing/enum.ir.txt | 79 ------ .../testData/codegen/bytecodeListing/enum.txt | 12 + ...eClassWithPrivateDeclarationsOnly_after.kt | 1 - ...ClassWithPrivateDeclarationsOnly_before.kt | 1 - .../crossinlineLambdaChain.ir.txt | 82 ------ .../enclosingInfo/crossinlineLambdaChain.txt | 60 ++--- .../inline/enclosingInfo/kt10259.ir.txt | 62 ----- .../inline/enclosingInfo/kt10259.txt | 58 +++-- ...mbdaInInitBlockNoPrimaryConstructor.ir.txt | 31 --- .../lambdaInInitBlockNoPrimaryConstructor.txt | 2 +- .../transformedConstructor.ir.txt | 56 ---- .../enclosingInfo/transformedConstructor.txt | 36 +-- ...nsformedConstructorWithNestedInline.ir.txt | 57 ---- ...transformedConstructorWithNestedInline.txt | 36 +-- .../bytecodeListing/inline/simpleNamed.ir.txt | 38 --- .../bytecodeListing/inline/simpleNamed.txt | 20 +- .../inline/suspendInlineReified.ir.txt | 17 -- .../inline/suspendInlineReified.txt | 14 +- .../javaDefaultInterfaceMember.ir.txt | 131 ---------- .../javaDefaultInterfaceMember.txt | 1 + ...efaultInterfaceMethodsInInlineClass.ir.txt | 60 ----- .../defaultInterfaceMethodsInInlineClass.txt | 2 + .../inlineClasses/inlineCharSequence.ir.txt | 25 -- .../inlineClasses/inlineCharSequence.txt | 4 +- ...ineClassTypeParametersInConstructor.ir.txt | 99 ------- ...inlineClassTypeParametersInConstructor.txt | 3 + .../UIntArrayWithFullJdk.ir.txt | 59 ----- .../inlineCollection/UIntArrayWithFullJdk.txt | 6 +- .../inlineCollection/collection.ir.txt | 34 --- .../inlineCollection/collection.txt | 2 +- .../inlineCollection/list.ir.txt | 50 ---- .../inlineClasses/inlineCollection/list.txt | 2 +- .../inlineClasses/inlineCollection/map.ir.txt | 40 --- .../inlineClasses/inlineCollection/map.txt | 9 +- .../inlineCollection/mapEntry.ir.txt | 21 -- .../inlineCollection/mapEntry.txt | 1 + .../inlineCollection/mutableCollection.ir.txt | 40 --- .../inlineCollection/mutableCollection.txt | 4 +- .../inlineCollection/mutableList.ir.txt | 61 ----- .../inlineCollection/mutableList.txt | 6 +- .../inlineCollection/mutableMap.ir.txt | 44 ---- .../inlineCollection/mutableMap.txt | 11 +- .../inlineCollection/mutableMapEntry.ir.txt | 22 -- .../inlineCollection/mutableMapEntry.txt | 1 + .../inlineCollection/mutableSet.ir.txt | 40 --- .../inlineCollection/mutableSet.txt | 4 +- .../inlineClasses/inlineCollection/set.ir.txt | 34 --- .../inlineClasses/inlineCollection/set.txt | 2 +- .../collection.ir.txt | 53 ---- .../collection.txt | 4 +- .../inlineCollectionOfInlineClass/list.ir.txt | 75 ------ .../inlineCollectionOfInlineClass/list.txt | 10 +- .../inlineCollectionOfInlineClass/map.ir.txt | 81 ------ .../inlineCollectionOfInlineClass/map.txt | 18 +- .../mapEntry.ir.txt | 58 ----- .../mapEntry.txt | 3 +- .../mutableCollection.ir.txt | 60 ----- .../mutableCollection.txt | 2 +- .../mutableList.ir.txt | 87 ------- .../mutableList.txt | 2 +- .../mutableMap.ir.txt | 85 ------ .../mutableMap.txt | 15 +- .../mutableMapEntry.ir.txt | 59 ----- .../mutableMapEntry.txt | 1 + .../mutableSet.ir.txt | 60 ----- .../mutableSet.txt | 2 +- .../mutableSet2.ir.txt | 77 ------ .../mutableSet2.txt | 2 +- .../inlineCollectionOfInlineClass/set.ir.txt | 53 ---- .../inlineCollectionOfInlineClass/set.txt | 4 +- .../privateAccessorNaming.ir.txt | 6 - .../noDefaultImpl/privateAccessorNaming.txt | 13 - .../jvmStatic/jvmStaticPrivate.ir.txt | 40 --- .../jvmStatic/jvmStaticPrivate.txt | 8 +- .../bytecodeListing/jvmStatic/kt31389.ir.txt | 26 -- .../bytecodeListing/jvmStatic/kt31389.txt | 4 +- .../codegen/bytecodeListing/kt42879.kt | 1 - .../codegen/bytecodeListing/kt43217.ir.txt | 25 -- .../codegen/bytecodeListing/kt43217.txt | 4 +- .../codegen/bytecodeListing/kt55769.ir.txt | 42 --- .../codegen/bytecodeListing/kt55769.txt | 13 +- .../localFunctions/genericClass.ir.txt | 9 - .../localFunctions/genericClass.txt | 12 +- .../localFunctions/genericInnerClass.ir.txt | 28 -- .../localFunctions/genericInnerClass.txt | 20 +- .../localFunctions/genericLocalClass.ir.txt | 19 -- .../localFunctions/genericLocalClass.txt | 14 +- .../localFunctions/inInitBlock.ir.txt | 15 -- .../localFunctions/inInitBlock.txt | 101 +------ .../localFunctions/simple.ir.txt | 6 - .../bytecodeListing/localFunctions/simple.txt | 14 +- .../main/multifileSuspend.ir.txt | 25 -- .../bytecodeListing/main/multifileSuspend.txt | 13 +- .../bytecodeListing/main/suspendMain.ir.txt | 18 -- .../bytecodeListing/main/suspendMain.txt | 13 +- ...elegationsToPrivateInterfaceMembers.ir.txt | 37 --- ...noDelegationsToPrivateInterfaceMembers.txt | 2 + ...oReceiverInCallableReferenceClasses.ir.txt | 68 ----- .../noReceiverInCallableReferenceClasses.txt | 18 +- .../noRemoveAtInReadOnly.ir.txt | 55 ---- .../bytecodeListing/noRemoveAtInReadOnly.txt | 11 +- ...pterForJavaInterfaceWithNullability.ir.txt | 40 --- ...AdapterForJavaInterfaceWithNullability.txt | 4 +- .../privateCompanionFields.ir.txt | 79 ------ .../privateCompanionFields.txt | 10 +- .../bytecodeListing/rawTypeInSignature.ir.txt | 42 --- .../bytecodeListing/rawTypeInSignature.txt | 26 +- .../sam/callableRefGenericFunInterface.ir.txt | 28 -- .../sam/callableRefGenericFunInterface.txt | 21 +- .../sam/callableRefGenericSamInterface.ir.txt | 18 -- .../sam/callableRefGenericSamInterface.txt | 15 +- .../callableRefSpecializedFunInterface.ir.txt | 29 --- .../callableRefSpecializedFunInterface.txt | 23 +- .../callableRefSpecializedSamInterface.ir.txt | 19 -- .../callableRefSpecializedSamInterface.txt | 17 +- .../sam/genericFunInterface.ir.txt | 26 -- .../sam/genericFunInterface.txt | 8 +- .../sam/genericSamInterface.ir.txt | 16 -- .../sam/genericSamInterface.txt | 2 +- .../sam/indySamConversionViaProxyFun.kt | 1 - .../bytecodeListing/sam/kt16650.ir.txt | 31 --- .../codegen/bytecodeListing/sam/kt16650.txt | 4 +- .../sam/lambdaGenericFunInterface.ir.txt | 23 -- .../sam/lambdaGenericFunInterface.txt | 4 +- .../sam/lambdaGenericSamInterface.ir.txt | 28 -- .../sam/lambdaGenericSamInterface.txt | 8 +- .../sam/lambdaSpecializedFunInterface.ir.txt | 24 -- .../sam/lambdaSpecializedFunInterface.txt | 6 +- .../sam/lambdaSpecializedSamInterface.ir.txt | 17 -- .../sam/lambdaSpecializedSamInterface.txt | 4 +- .../sam/nonApproxToValidSupertype.ir.txt | 52 ---- .../sam/nonApproxToValidSupertype.txt | 2 +- .../sam/nonApproxToValidSupertype2.ir.txt | 62 ----- .../sam/nonApproxToValidSupertype2.txt | 2 +- .../sam/privateInlineSamAdapter.ir.txt | 29 --- .../sam/privateInlineSamAdapter.txt | 3 +- .../sam/reusedSamWrapperClasses.ir.txt | 51 ---- .../sam/reusedSamWrapperClasses.txt | 3 +- .../sam/samAdapterAndInlinedOne.ir.txt | 30 --- .../sam/samAdapterAndInlinedOne.txt | 4 +- .../sam/samAdapterInInlineLambda.ir.txt | 29 --- .../sam/samAdapterInInlineLambda.txt | 3 +- .../sam/severalProxyFunsInInit.ir.txt | 21 -- .../sam/severalProxyFunsInInit.txt | 41 +-- .../sam/specializedFunInterface.ir.txt | 26 -- .../sam/specializedFunInterface.txt | 8 +- .../sam/specializedSamInterface.ir.txt | 16 -- .../sam/specializedSamInterface.txt | 2 +- .../sam/wrapperInlinedFromAnotherClass.ir.txt | 81 ------ .../sam/wrapperInlinedFromAnotherClass.txt | 3 +- .../sealed/permittedSubclasses_1_7.kt | 3 +- .../specialBridges/abstractCollections.ir.txt | 130 --------- .../specialBridges/abstractCollections.txt | 11 +- .../specialBridges/abstractLists.ir.txt | 200 -------------- .../specialBridges/abstractLists.txt | 41 ++- .../abstractMutableLists.ir.txt | 119 --------- .../specialBridges/abstractMutableLists.txt | 12 - .../specialBridges/abstractSets.ir.txt | 130 --------- .../specialBridges/abstractSets.txt | 11 +- .../specialBridges/contains.ir.txt | 142 ---------- .../specialBridges/contains.txt | 2 - .../specialBridges/kt41123.ir.txt | 30 --- .../specialBridges/kt41123.txt | 7 +- .../specialBridges/kt48945.ir.txt | 246 ------------------ .../specialBridges/kt48945.txt | 80 ++++-- .../mutableCollectionOfPrimitive.ir.txt | 47 ---- .../mutableCollectionOfPrimitive.txt | 6 +- ...oSpecialBridgeIfPresentInSuperClass.ir.txt | 28 -- .../noSpecialBridgeIfPresentInSuperClass.txt | 3 - .../bytecodeListing/specialBridges/number.kt | 2 - .../redundantStubForSize.ir.txt | 28 -- .../specialBridges/redundantStubForSize.txt | 2 +- .../signatures/genericClass.ir.txt | 47 ---- .../signatures/genericClass.txt | 2 + .../signatures/implementsJavaMap.ir.txt | 36 --- .../signatures/implementsJavaMap.txt | 6 +- .../implementsJavaMapWithCustomEntries.ir.txt | 14 - .../implementsJavaMapWithCustomEntries.txt | 7 +- .../signatures/implementsMap.ir.txt | 72 ----- .../signatures/implementsMap.txt | 11 +- .../signatures/implementsSortedMap.ir.txt | 38 --- .../signatures/implementsSortedMap.txt | 3 +- .../signatures/nonGenericClass.ir.txt | 61 ----- .../signatures/nonGenericClass.txt | 14 +- .../partiallySpecializedClass.ir.txt | 55 ---- .../signatures/partiallySpecializedClass.txt | 2 + .../specialBridges/specialBridgeForGet.ir.txt | 71 ----- .../specialBridges/specialBridgeForGet.txt | 13 +- .../specialBridges/unsignedArray.ir.txt | 38 --- .../specialBridges/unsignedArray.txt | 4 +- .../allOpenOnNotClasses.ir.txt | 45 ---- .../bytecodeListing/allOpenOnNotClasses.txt | 5 +- .../bytecodeListing/anonymousObject.ir.txt | 36 --- .../bytecodeListing/anonymousObject.txt | 13 +- .../bytecodeListing/privateMembers.ir.txt | 24 -- .../bytecodeListing/privateMembers.txt | 2 +- .../superClassAnnotation.ir.txt | 60 ----- .../bytecodeListing/superClassAnnotation.txt | 1 + .../bytecodeListing/annoOnNotClass.ir.txt | 47 ---- .../bytecodeListing/annoOnNotClass.txt | 3 + 348 files changed, 865 insertions(+), 9800 deletions(-) delete mode 100644 compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/annotations/kt9320.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/annotations/literals.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/enum.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/simpleNamed.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/kt43217.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/kt55769.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/localFunctions/simple.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/main/multifileSuspend.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/main/suspendMain.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/privateCompanionFields.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/rawTypeInSignature.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/kt16650.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/contains.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.ir.txt delete mode 100644 compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.ir.txt delete mode 100644 plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt delete mode 100644 plugins/allopen/testData/bytecodeListing/anonymousObject.ir.txt delete mode 100644 plugins/allopen/testData/bytecodeListing/privateMembers.ir.txt delete mode 100644 plugins/allopen/testData/bytecodeListing/superClassAnnotation.ir.txt delete mode 100644 plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt diff --git a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.ir.txt b/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.ir.txt deleted file mode 100644 index 93583a16755..00000000000 --- a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.ir.txt +++ /dev/null @@ -1,43 +0,0 @@ -@kotlin.Metadata -final class B$test$1 { - // source: 'accessorForProtectedPropertyWithPrivateSetter.kt' - enclosing method B.test()Lkotlin/jvm/functions/Function0; - synthetic final field this$0: B - inner (anonymous) class B$test$1 - method (p0: B): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class B { - // source: 'accessorForProtectedPropertyWithPrivateSetter.kt' - inner (anonymous) class B$test$1 - public method (): void - public synthetic final static method access$getVo(p0: B): java.lang.String - public final @org.jetbrains.annotations.NotNull method test(): kotlin.jvm.functions.Function0 -} - -@kotlin.Metadata -final class a/A$fk$1 { - // source: 'a.kt' - enclosing method a/A.fk()Lkotlin/jvm/functions/Function0; - synthetic final field this$0: a.A - inner (anonymous) class a/A$fk$1 - method (p0: a.A): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public class a/A { - // source: 'a.kt' - private @org.jetbrains.annotations.NotNull field vk: java.lang.String - private @org.jetbrains.annotations.NotNull field vo: java.lang.String - inner (anonymous) class a/A$fk$1 - public method (): void - public synthetic final static method access$setVk$p(p0: a.A, p1: java.lang.String): void - public final @org.jetbrains.annotations.NotNull method fk(): kotlin.jvm.functions.Function0 - protected final @org.jetbrains.annotations.NotNull method getVk(): java.lang.String - protected final @org.jetbrains.annotations.NotNull method getVo(): java.lang.String -} diff --git a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.txt b/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.txt index f99c1c7f91a..93583a16755 100644 --- a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.txt +++ b/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetter.txt @@ -6,7 +6,7 @@ final class B$test$1 { inner (anonymous) class B$test$1 method (p0: B): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -14,7 +14,7 @@ public final class B { // source: 'accessorForProtectedPropertyWithPrivateSetter.kt' inner (anonymous) class B$test$1 public method (): void - public synthetic final static method access$getVo$p(p0: B): java.lang.String + public synthetic final static method access$getVo(p0: B): java.lang.String public final @org.jetbrains.annotations.NotNull method test(): kotlin.jvm.functions.Function0 } @@ -26,7 +26,7 @@ final class a/A$fk$1 { inner (anonymous) class a/A$fk$1 method (p0: a.A): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -36,7 +36,6 @@ public class a/A { private @org.jetbrains.annotations.NotNull field vo: java.lang.String inner (anonymous) class a/A$fk$1 public method (): void - public synthetic final static method access$getVk$p(p0: a.A): java.lang.String public synthetic final static method access$setVk$p(p0: a.A, p1: java.lang.String): void public final @org.jetbrains.annotations.NotNull method fk(): kotlin.jvm.functions.Function0 protected final @org.jetbrains.annotations.NotNull method getVk(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.ir.txt b/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.ir.txt deleted file mode 100644 index 510a37a1361..00000000000 --- a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.Metadata -public final class B$test$1 { - // source: 'accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.kt' - enclosing method B.test()Ljava/lang/Object; - synthetic final field this$0: B - inner (anonymous) class B$test$1 - method (p0: B): void - public method toString(): java.lang.String -} - -@kotlin.Metadata -public final class B { - // source: 'accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.kt' - inner (anonymous) class B$test$1 - public method (): void - public synthetic final static method access$getVo(p0: B): java.lang.String - public final @org.jetbrains.annotations.NotNull method test(): java.lang.Object -} - -@kotlin.Metadata -final class a/A$fk$1 { - // source: 'a.kt' - enclosing method a/A.fk()Lkotlin/jvm/functions/Function0; - synthetic final field this$0: a.A - inner (anonymous) class a/A$fk$1 - method (p0: a.A): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public class a/A { - // source: 'a.kt' - private @org.jetbrains.annotations.NotNull field vk: java.lang.String - private @org.jetbrains.annotations.NotNull field vo: java.lang.String - inner (anonymous) class a/A$fk$1 - public method (): void - public synthetic final static method access$setVk$p(p0: a.A, p1: java.lang.String): void - public final @org.jetbrains.annotations.NotNull method fk(): kotlin.jvm.functions.Function0 - protected final @org.jetbrains.annotations.NotNull method getVk(): java.lang.String - protected final @org.jetbrains.annotations.NotNull method getVo(): java.lang.String -} diff --git a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.txt b/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.txt index e67e79793b5..510a37a1361 100644 --- a/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.txt +++ b/compiler/testData/codegen/bytecodeListing/accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.txt @@ -5,7 +5,7 @@ public final class B$test$1 { synthetic final field this$0: B inner (anonymous) class B$test$1 method (p0: B): void - public @org.jetbrains.annotations.NotNull method toString(): java.lang.String + public method toString(): java.lang.String } @kotlin.Metadata @@ -13,7 +13,7 @@ public final class B { // source: 'accessorForProtectedPropertyWithPrivateSetterInObjectLiteral.kt' inner (anonymous) class B$test$1 public method (): void - public synthetic final static method access$getVo$p(p0: B): java.lang.String + public synthetic final static method access$getVo(p0: B): java.lang.String public final @org.jetbrains.annotations.NotNull method test(): java.lang.Object } @@ -25,7 +25,7 @@ final class a/A$fk$1 { inner (anonymous) class a/A$fk$1 method (p0: a.A): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -35,7 +35,6 @@ public class a/A { private @org.jetbrains.annotations.NotNull field vo: java.lang.String inner (anonymous) class a/A$fk$1 public method (): void - public synthetic final static method access$getVk$p(p0: a.A): java.lang.String public synthetic final static method access$setVk$p(p0: a.A, p1: java.lang.String): void public final @org.jetbrains.annotations.NotNull method fk(): kotlin.jvm.functions.Function0 protected final @org.jetbrains.annotations.NotNull method getVk(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.ir.txt b/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.ir.txt deleted file mode 100644 index 9eb5b4f087f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.ir.txt +++ /dev/null @@ -1,16 +0,0 @@ -@kotlin.Metadata -public final class A { - // source: 'accessorForTopLevelMembers.kt' - public method (): void - public final @org.jetbrains.annotations.NotNull method g(): java.lang.String -} - -@kotlin.Metadata -public final class AccessorForTopLevelMembersKt { - // source: 'accessorForTopLevelMembers.kt' - private final static @org.jetbrains.annotations.NotNull field x: java.lang.String - static method (): void - public synthetic final static method access$f(p0: java.lang.String): java.lang.String - public synthetic final static method access$getX$p(): java.lang.String - private final static method f(p0: java.lang.String): java.lang.String -} diff --git a/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.txt b/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.txt index 4bb382d5e44..9eb5b4f087f 100644 --- a/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.txt +++ b/compiler/testData/codegen/bytecodeListing/accessorForTopLevelMembers.txt @@ -8,7 +8,7 @@ public final class A { @kotlin.Metadata public final class AccessorForTopLevelMembersKt { // source: 'accessorForTopLevelMembers.kt' - private final static field x: java.lang.String + private final static @org.jetbrains.annotations.NotNull field x: java.lang.String static method (): void public synthetic final static method access$f(p0: java.lang.String): java.lang.String public synthetic final static method access$getX$p(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.ir.txt b/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.ir.txt deleted file mode 100644 index 6adf0488331..00000000000 --- a/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.ir.txt +++ /dev/null @@ -1,44 +0,0 @@ -@kotlin.Metadata -final class test/C$f$1 { - // source: 'C.kt' - enclosing method test/C.f()Ljava/lang/String; - public final static field INSTANCE: test.C$f$1 - inner (anonymous) class test/C$f$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -final class test/C$g$1 { - // source: 'C.kt' - enclosing method test/C.g()Lkotlin/jvm/functions/Function0; - public final static field INSTANCE: test.C$g$1 - inner (anonymous) class test/C$g$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class test/C { - // source: 'C.kt' - inner (anonymous) class test/C$f$1 - inner (anonymous) class test/C$g$1 - public method (): void - public synthetic final static method access$getX$p$s65(): java.lang.String - public synthetic final static method access$getX$p$s66(): java.lang.String - public synthetic final static method access$h$s65(): java.lang.String - public synthetic final static method access$h$s66(): java.lang.String - public final @org.jetbrains.annotations.NotNull method f(): java.lang.String - public final @org.jetbrains.annotations.NotNull method g(): kotlin.jvm.functions.Function0 - public inner class A$B -} - -@kotlin.Metadata -public final class test/CKt { - // source: 'C.kt' - public final static method eval(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.txt b/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.txt index 6656b17980a..6adf0488331 100644 --- a/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.txt +++ b/compiler/testData/codegen/bytecodeListing/accessorsForProtectedStaticJavaFieldInOtherPackage.txt @@ -7,7 +7,7 @@ final class test/C$f$1 { static method (): void method (): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -19,7 +19,7 @@ final class test/C$g$1 { static method (): void method (): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -32,10 +32,9 @@ public final class test/C { public synthetic final static method access$getX$p$s66(): java.lang.String public synthetic final static method access$h$s65(): java.lang.String public synthetic final static method access$h$s66(): java.lang.String - public synthetic final static method access$setX$p$s65(p0: java.lang.String): void - public synthetic final static method access$setX$p$s66(p0: java.lang.String): void public final @org.jetbrains.annotations.NotNull method f(): java.lang.String public final @org.jetbrains.annotations.NotNull method g(): kotlin.jvm.functions.Function0 + public inner class A$B } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/annotations/annotationCtorCallGenerateSynthetic.kt b/compiler/testData/codegen/bytecodeListing/annotations/annotationCtorCallGenerateSynthetic.kt index 6fca1020679..e1b90a060a0 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/annotationCtorCallGenerateSynthetic.kt +++ b/compiler/testData/codegen/bytecodeListing/annotations/annotationCtorCallGenerateSynthetic.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM // !LANGUAGE: +InstantiationOfAnnotationClasses annotation class Foo(val int: Int) @@ -8,4 +7,4 @@ annotation class Bar fun box() { val foo = Foo(42) -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bytecodeListing/annotations/kt9320.ir.txt b/compiler/testData/codegen/bytecodeListing/annotations/kt9320.ir.txt deleted file mode 100644 index 12b9fb3fcb9..00000000000 --- a/compiler/testData/codegen/bytecodeListing/annotations/kt9320.ir.txt +++ /dev/null @@ -1,50 +0,0 @@ -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class Ann { - // source: 'kt9320.kt' -} - -@kotlin.annotation.Target(allowedTargets=[EXPRESSION]) -@kotlin.annotation.Retention(value=SOURCE) -@java.lang.annotation.Retention(value=SOURCE) -@java.lang.annotation.Target(value=[]) -@kotlin.Metadata -public annotation class AnnExpr { - // source: 'kt9320.kt' -} - -@Ann -@kotlin.Metadata -public final class Kt9320Kt$foo$v$1 { - // source: 'kt9320.kt' - enclosing method Kt9320Kt.foo()V - inner (anonymous) class Kt9320Kt$foo$v$1 - method (): void -} - -@kotlin.Metadata -final class Kt9320Kt$foo$w$1 { - // source: 'kt9320.kt' - enclosing method Kt9320Kt.foo()V - public final static field INSTANCE: Kt9320Kt$foo$w$1 - inner (anonymous) class Kt9320Kt$foo$w$1 - static method (): void - method (): void - public final @Ann method invoke(p0: My): java.lang.Integer - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class Kt9320Kt { - // source: 'kt9320.kt' - inner (anonymous) class Kt9320Kt$foo$v$1 - inner (anonymous) class Kt9320Kt$foo$w$1 - public final static method foo(): void -} - -@Ann -@kotlin.Metadata -public class My { - // source: 'kt9320.kt' - public method (): void -} diff --git a/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt b/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt index b0545a10f1e..12b9fb3fcb9 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt @@ -30,7 +30,7 @@ final class Kt9320Kt$foo$w$1 { inner (anonymous) class Kt9320Kt$foo$w$1 static method (): void method (): void - public final @Ann method invoke(@org.jetbrains.annotations.NotNull p0: My): int + public final @Ann method invoke(p0: My): java.lang.Integer public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/annotations/literals.ir.txt b/compiler/testData/codegen/bytecodeListing/annotations/literals.ir.txt deleted file mode 100644 index dfc55475dfd..00000000000 --- a/compiler/testData/codegen/bytecodeListing/annotations/literals.ir.txt +++ /dev/null @@ -1,83 +0,0 @@ -@kotlin.annotation.Target(allowedTargets=[CLASS]) -@java.lang.annotation.Retention(value=RUNTIME) -@java.lang.annotation.Target(value=[TYPE]) -@kotlin.Metadata -public annotation class ClsAnn { - // source: 'literals.kt' -} - -@kotlin.annotation.Target(allowedTargets=[EXPRESSION]) -@kotlin.annotation.Retention(value=SOURCE) -@java.lang.annotation.Retention(value=SOURCE) -@java.lang.annotation.Target(value=[]) -@kotlin.Metadata -public annotation class ExprAnn { - // source: 'literals.kt' -} - -@kotlin.annotation.Target(allowedTargets=[FUNCTION]) -@java.lang.annotation.Retention(value=RUNTIME) -@java.lang.annotation.Target(value=[METHOD]) -@kotlin.Metadata -public annotation class FunAnn { - // source: 'literals.kt' -} - -@kotlin.Metadata -final class LiteralsKt$foo$1 { - // source: 'literals.kt' - enclosing method LiteralsKt.foo(I)LMy; - synthetic final field $arg: int - inner (anonymous) class LiteralsKt$foo$1 - method (p0: int): void - public final @FunAnn method invoke(): java.lang.Integer - public synthetic bridge method invoke(): java.lang.Object -} - -@kotlin.Metadata -final class LiteralsKt$foo$2 { - // source: 'literals.kt' - enclosing method LiteralsKt.foo(I)LMy; - synthetic final field $arg: int - inner (anonymous) class LiteralsKt$foo$2 - method (p0: int): void - public final method invoke(): java.lang.Integer - public synthetic bridge method invoke(): java.lang.Object -} - -@ClsAnn -@kotlin.Metadata -public final class LiteralsKt$foo$3 { - // source: 'literals.kt' - enclosing method LiteralsKt.foo(I)LMy; - inner (anonymous) class LiteralsKt$foo$3 - method (): void -} - -@kotlin.Metadata -final class LiteralsKt$foo$x$1 { - // source: 'literals.kt' - enclosing method LiteralsKt.foo(I)LMy; - synthetic final field $arg: int - inner (anonymous) class LiteralsKt$foo$x$1 - method (p0: int): void - public final @FunAnn method invoke(): java.lang.Integer - public synthetic bridge method invoke(): java.lang.Object -} - -@kotlin.Metadata -public final class LiteralsKt { - // source: 'literals.kt' - inner (anonymous) class LiteralsKt$foo$1 - inner (anonymous) class LiteralsKt$foo$2 - inner (anonymous) class LiteralsKt$foo$3 - inner (anonymous) class LiteralsKt$foo$x$1 - public final static method bar(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): int - public final static @org.jetbrains.annotations.NotNull method foo(p0: int): My -} - -@kotlin.Metadata -public class My { - // source: 'literals.kt' - public method (): void -} diff --git a/compiler/testData/codegen/bytecodeListing/annotations/literals.txt b/compiler/testData/codegen/bytecodeListing/annotations/literals.txt index df72e525a1b..dfc55475dfd 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/literals.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/literals.txt @@ -30,7 +30,7 @@ final class LiteralsKt$foo$1 { synthetic final field $arg: int inner (anonymous) class LiteralsKt$foo$1 method (p0: int): void - public final @FunAnn method invoke(): int + public final @FunAnn method invoke(): java.lang.Integer public synthetic bridge method invoke(): java.lang.Object } @@ -41,7 +41,7 @@ final class LiteralsKt$foo$2 { synthetic final field $arg: int inner (anonymous) class LiteralsKt$foo$2 method (p0: int): void - public final method invoke(): int + public final method invoke(): java.lang.Integer public synthetic bridge method invoke(): java.lang.Object } @@ -61,7 +61,7 @@ final class LiteralsKt$foo$x$1 { synthetic final field $arg: int inner (anonymous) class LiteralsKt$foo$x$1 method (p0: int): void - public final @FunAnn method invoke(): int + public final @FunAnn method invoke(): java.lang.Integer public synthetic bridge method invoke(): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.ir.txt b/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.ir.txt deleted file mode 100644 index 2a8f431f9aa..00000000000 --- a/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -@kotlin.Metadata -public final class LocalClassWithCapturedParamsKt$localCaptured$A { - // source: 'localClassWithCapturedParams.kt' - enclosing method LocalClassWithCapturedParamsKt.localCaptured()Ljava/lang/Object; - private final field x: int - private final field z: java.lang.String - inner (local) class LocalClassWithCapturedParamsKt$localCaptured$A A - public method (p0: int, @Simple(value="K") p1: java.lang.String): void - public final method getX(): int - public final method getZ(): java.lang.String -} - -@kotlin.Metadata -public final class LocalClassWithCapturedParamsKt { - // source: 'localClassWithCapturedParams.kt' - inner (local) class LocalClassWithCapturedParamsKt$localCaptured$A A - public final static @org.jetbrains.annotations.NotNull method localCaptured(): java.lang.Object -} - -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class Simple { - // source: 'localClassWithCapturedParams.kt' - public abstract method value(): java.lang.String -} diff --git a/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt b/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt index 45c5c62e2c1..2a8f431f9aa 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/localClassWithCapturedParams.txt @@ -2,13 +2,12 @@ public final class LocalClassWithCapturedParamsKt$localCaptured$A { // source: 'localClassWithCapturedParams.kt' enclosing method LocalClassWithCapturedParamsKt.localCaptured()Ljava/lang/Object; - synthetic final field $z: int private final field x: int - private final @org.jetbrains.annotations.NotNull field z: java.lang.String + private final field z: java.lang.String inner (local) class LocalClassWithCapturedParamsKt$localCaptured$A A - public method (p0: int, @Simple(value="K") @org.jetbrains.annotations.NotNull p1: java.lang.String): void + public method (p0: int, @Simple(value="K") p1: java.lang.String): void public final method getX(): int - public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String + public final method getZ(): java.lang.String } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.ir.txt b/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.ir.txt deleted file mode 100644 index 8351b54f486..00000000000 --- a/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.ir.txt +++ /dev/null @@ -1,34 +0,0 @@ -@kotlin.Metadata -synthetic final class A$testDefaultArguments$1 { - // source: 'adaptedReference.kt' - enclosing method A.testDefaultArguments()V - inner (anonymous) class A$testDefaultArguments$1 - method (p0: java.lang.Object): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -synthetic final class A$testDefaultArguments$2 { - // source: 'adaptedReference.kt' - enclosing method A.testDefaultArguments()V - inner (anonymous) class A$testDefaultArguments$2 - method (p0: java.lang.Object): void - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object - public final method invoke(p0: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class A { - // source: 'adaptedReference.kt' - inner (anonymous) class A$testDefaultArguments$1 - inner (anonymous) class A$testDefaultArguments$2 - public method (): void - public synthetic final static method access$testDefaultArguments$defaultArgs$0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object - synthetic static method defaultArgs$default(p0: A, p1: int, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String - private final method defaultArgs(p0: int, p1: java.lang.String): java.lang.String - private final method myApply(p0: kotlin.jvm.functions.Function0): void - private final method myApplySuspend(p0: kotlin.jvm.functions.Function1): void - private synthetic final static method testDefaultArguments$defaultArgs$0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object - public final method testDefaultArguments(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.txt b/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.txt index aec4b0573d3..8351b54f486 100644 --- a/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.txt +++ b/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference.txt @@ -3,9 +3,9 @@ synthetic final class A$testDefaultArguments$1 { // source: 'adaptedReference.kt' enclosing method A.testDefaultArguments()V inner (anonymous) class A$testDefaultArguments$1 - method (p0: A): void + method (p0: java.lang.Object): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -13,8 +13,9 @@ synthetic final class A$testDefaultArguments$2 { // source: 'adaptedReference.kt' enclosing method A.testDefaultArguments()V inner (anonymous) class A$testDefaultArguments$2 - method (p0: A): void - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + method (p0: java.lang.Object): void + public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object + public final method invoke(p0: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -23,9 +24,11 @@ public final class A { inner (anonymous) class A$testDefaultArguments$1 inner (anonymous) class A$testDefaultArguments$2 public method (): void + public synthetic final static method access$testDefaultArguments$defaultArgs$0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object synthetic static method defaultArgs$default(p0: A, p1: int, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String private final method defaultArgs(p0: int, p1: java.lang.String): java.lang.String private final method myApply(p0: kotlin.jvm.functions.Function0): void private final method myApplySuspend(p0: kotlin.jvm.functions.Function1): void + private synthetic final static method testDefaultArguments$defaultArgs$0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object public final method testDefaultArguments(): void } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.ir.txt deleted file mode 100644 index 547b26a7d2a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -@kotlin.Metadata -public final class ListSet { - // source: 'ListAndSet.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.Object - public method getSize(): int - public method indexOf(@org.jetbrains.annotations.Nullable p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(@org.jetbrains.annotations.Nullable p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method replaceAll(p0: java.util.function.UnaryOperator): void - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method sort(p0: java.util.Comparator): void - public @org.jetbrains.annotations.NotNull method spliterator(): java.util.Spliterator - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.txt index 9e889e63227..547b26a7d2a 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/ListAndSet.txt @@ -7,14 +7,14 @@ public final class ListSet { public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.Object): boolean + public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.Object public method getSize(): int - public method indexOf(@org.jetbrains.annotations.NotNull p0: java.lang.Object): int + public method indexOf(@org.jetbrains.annotations.Nullable p0: java.lang.Object): int public method isEmpty(): boolean public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(@org.jetbrains.annotations.NotNull p0: java.lang.Object): int + public method lastIndexOf(@org.jetbrains.annotations.Nullable p0: java.lang.Object): int public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.ir.txt deleted file mode 100644 index e46725496d4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -@kotlin.Metadata -public abstract class MindMap { - // source: 'abstractMapRedefiningGetAny.kt' - public method (): void - public abstract method containsKey(p0: int): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public final @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.String - public abstract method get(p0: int): java.lang.String - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public abstract method remove(p0: int): java.lang.String - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.txt index 7f3a8a264a3..e46725496d4 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractMapRedefiningGetAny.txt @@ -9,14 +9,16 @@ public abstract class MindMap { public bridge final method entrySet(): java.util.Set public final @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.String public abstract method get(p0: int): java.lang.String - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set public abstract method remove(p0: int): java.lang.String - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.ir.txt deleted file mode 100644 index e5dbc48f20f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> ByteShortMap { - // source: 'byteShortMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public <(Ljava/util/Map<+Ljava/lang/Byte;+Ljava/lang/Short;>;)V> method putAll(p0: java.util.Map): void - public method (): void - public method clear(): void - public abstract method containsKey(p0: byte): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: short): boolean - public abstract method get(p0: byte): java.lang.Short - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.Short - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public method put(p0: byte, p1: short): java.lang.Short - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Short - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.txt index 9f9296cf920..e5dbc48f20f 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMap.txt @@ -12,13 +12,16 @@ public abstract class method containsValue(p0: java.lang.Object): boolean public abstract method containsValue(p0: short): boolean public abstract method get(p0: byte): java.lang.Short - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Short public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public method put(p0: byte, p1: short): java.lang.Short - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Short public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.ir.txt deleted file mode 100644 index f43fc755321..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMutableMap;> ByteShortMutableMap { - // source: 'byteShortMutableMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public method (): void - public abstract method containsKey(p0: byte): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: short): boolean - public abstract method get(p0: byte): java.lang.Short - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.Short - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public abstract method remove(p0: byte): java.lang.Short - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.Short - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.txt index 3c12495db9e..f43fc755321 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/byteShortMutableMap.txt @@ -10,12 +10,15 @@ public abstract class method containsValue(p0: java.lang.Object): boolean public abstract method containsValue(p0: short): boolean public abstract method get(p0: byte): java.lang.Short - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Short public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public abstract method remove(p0: byte): java.lang.Short - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.Short public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.ir.txt deleted file mode 100644 index b7310e8cf0b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.ir.txt +++ /dev/null @@ -1,39 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> DoubleCollection { - // source: 'collection.kt' - public <()Ljava/util/Iterator;> method iterator(): java.util.Iterator - public <(Ljava/util/Collection<+Ljava/lang/Double;>;)Z> method addAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public method add(p0: double): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method clear(): void - public abstract method contains(p0: double): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> StringCollection { - // source: 'collection.kt' - public <()Ljava/util/Iterator;> method iterator(): java.util.Iterator - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/String;>;)Z> method addAll(p0: java.util.Collection): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.txt index 5d24531511e..b7310e8cf0b 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/collection.txt @@ -8,7 +8,7 @@ public abstract class([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void public method add(p0: double): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method clear(): void public abstract method contains(p0: double): boolean public bridge final method contains(p0: java.lang.Object): boolean @@ -27,7 +27,7 @@ public abstract class;)Z> method addAll(p0: java.util.Collection): boolean public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method clear(): void public bridge final method contains(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.ir.txt deleted file mode 100644 index 31e1e65a4a8..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.ir.txt +++ /dev/null @@ -1,16 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Collection;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericCollection { - // source: 'genericCollection.kt' - public <()Ljava/util/Iterator;> method iterator(): java.util.Iterator - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+TT;>;)Z> method addAll(p0: java.util.Collection): boolean - public <(TT;)Z> method add(p0: java.lang.Object): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public method clear(): void - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.txt index 363d43b592e..31e1e65a4a8 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericCollection.txt @@ -9,7 +9,6 @@ public abstract class<Ljava/lang/Object;Ljava/util/Collect public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method remove(p0: java.lang.Object): boolean public bridge final method size(): int diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.ir.txt deleted file mode 100644 index 5db88b0ccb1..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericMap { - // source: 'genericMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TK;+TV;>;)V> method putAll(p0: java.util.Map): void - public <(TK;TV;)TV;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method (): void - public method clear(): void - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.txt index bb936496956..5db88b0ccb1 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMap.txt @@ -9,12 +9,10 @@ public abstract class<Ljava/lang/Objec public <(TK;TV;)TV;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method (): void public method clear(): void - public abstract method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.ir.txt deleted file mode 100644 index f04092bde31..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.ir.txt +++ /dev/null @@ -1,9 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Collection;Lkotlin/jvm/internal/markers/KMutableCollection;> GenericMutableCollection { - // source: 'genericMutableCollection.kt' - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public abstract method getSize(): int - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.txt index 47ff83a0ffc..f04092bde31 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableCollection.txt @@ -3,9 +3,7 @@ public abstract class<Ljava/lang/Object;Ljava/util/Collect // source: 'genericMutableCollection.kt' public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method remove(p0: java.lang.Object): boolean public bridge final method size(): int public method toArray(): java.lang.Object[] } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.ir.txt deleted file mode 100644 index 064afd1feb2..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.ir.txt +++ /dev/null @@ -1,11 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/List;Lkotlin/jvm/internal/markers/KMutableList;> GenericMutableList { - // source: 'genericMutableList.kt' - public bridge final <(I)TT;> method remove(p0: int): java.lang.Object - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public abstract method getSize(): int - public abstract method removeAt(p0: int): java.lang.Object - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.txt index 19613e3ca69..064afd1feb2 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableList.txt @@ -4,11 +4,7 @@ public abstract class<Ljava/lang/Object;Ljava/util/List method remove(p0: int): java.lang.Object public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int - public abstract method remove(p0: java.lang.Object): boolean public abstract method removeAt(p0: int): java.lang.Object public bridge final method size(): int public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.ir.txt deleted file mode 100644 index 1e91dd03b89..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> GenericMutableMap { - // source: 'genericMutableMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public method (): void - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.txt index a8d8338d33b..1e91dd03b89 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericMutableMap.txt @@ -5,13 +5,10 @@ public abstract class<Ljava/lang/Objec public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set public method (): void - public abstract method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public abstract method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.ir.txt deleted file mode 100644 index d5fb822e06f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericStringMap { - // source: 'genericStringMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public <(Ljava/util/Map<+TK;+Ljava/lang/String;>;)V> method putAll(p0: java.util.Map): void - public <(TK;Ljava/lang/String;)Ljava/lang/String;> method put(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public method (): void - public method clear(): void - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.String): boolean - public synthetic bridge method get(p0: java.lang.Object): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.String - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.txt index 92d37db8e1d..d5fb822e06f 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMap.txt @@ -4,20 +4,20 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map;> method values(): java.util.Collection public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)Ljava/lang/String;> method get(p0: java.lang.Object): java.lang.Object - public <(Ljava/lang/Object;)Ljava/lang/String;> method remove(p0: java.lang.Object): java.lang.Object public <(Ljava/util/Map<+TK;+Ljava/lang/String;>;)V> method putAll(p0: java.util.Map): void public <(TK;Ljava/lang/String;)Ljava/lang/String;> method put(p0: java.lang.Object, p1: java.lang.String): java.lang.String public method (): void public method clear(): void - public abstract method containsKey(p0: java.lang.Object): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public abstract method containsValue(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.Object): java.lang.String + public synthetic bridge method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.String public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.ir.txt deleted file mode 100644 index fc62f252b4d..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> GenericStringMutableMap { - // source: 'genericStringMutableMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public method (): void - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.String): boolean - public synthetic bridge method get(p0: java.lang.Object): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.txt index a6fdd017e06..fc62f252b4d 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/genericStringMutableMap.txt @@ -4,17 +4,15 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map;> method values(): java.util.Collection public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)Ljava/lang/String;> method get(p0: java.lang.Object): java.lang.Object - public bridge final <(Ljava/lang/Object;)Ljava/lang/String;> method remove(p0: java.lang.Object): java.lang.Object public method (): void - public abstract method containsKey(p0: java.lang.Object): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public abstract method containsValue(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.Object): java.lang.String + public synthetic bridge method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public abstract method remove(p0: java.lang.Object): java.lang.String + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.ir.txt deleted file mode 100644 index dbbbfcdb3ca..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.ir.txt +++ /dev/null @@ -1,88 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> DoubleList { - // source: 'list.kt' - public <()Ljava/util/ListIterator;> method listIterator(): java.util.ListIterator - public <(I)Ljava/util/ListIterator;> method listIterator(p0: int): java.util.ListIterator - public <(II)Ljava/util/List;> method subList(p0: int, p1: int): java.util.List - public <(ILjava/util/Collection<+Ljava/lang/Double;>;)Z> method addAll(p0: int, p1: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Double;>;)Z> method addAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public method add(p0: double): boolean - public method add(p0: int, p1: double): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method clear(): void - public abstract method contains(p0: double): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method indexOf(p0: double): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: double): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public method remove(p0: int): double - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method set(p0: int, p1: double): java.lang.Double - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/List;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericList { - // source: 'list.kt' - public <()Ljava/util/ListIterator;> method listIterator(): java.util.ListIterator - public <(I)Ljava/util/ListIterator;> method listIterator(p0: int): java.util.ListIterator - public <(I)TT;> method remove(p0: int): java.lang.Object - public <(II)Ljava/util/List;> method subList(p0: int, p1: int): java.util.List - public <(ILjava/util/Collection<+TT;>;)Z> method addAll(p0: int, p1: java.util.Collection): boolean - public <(ITT;)TT;> method set(p0: int, p1: java.lang.Object): java.lang.Object - public <(ITT;)V> method add(p0: int, p1: java.lang.Object): void - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+TT;>;)Z> method addAll(p0: java.util.Collection): boolean - public <(TT;)Z> method add(p0: java.lang.Object): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public method clear(): void - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> StringList { - // source: 'list.kt' - public <()Ljava/util/ListIterator;> method listIterator(): java.util.ListIterator - public <(I)Ljava/util/ListIterator;> method listIterator(p0: int): java.util.ListIterator - public <(II)Ljava/util/List;> method subList(p0: int, p1: int): java.util.List - public <(ILjava/util/Collection<+Ljava/lang/String;>;)Z> method addAll(p0: int, p1: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/String;>;)Z> method addAll(p0: java.util.Collection): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.String): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.String): int - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.String - public method remove(p0: java.lang.Object): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.String): java.lang.String - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.txt index fe92f920936..dbbbfcdb3ca 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/list.txt @@ -12,8 +12,8 @@ public abstract class;Lkot public method (): void public method add(p0: double): boolean public method add(p0: int, p1: double): void - public synthetic method add(p0: int, p1: java.lang.Object): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): boolean public method clear(): void public abstract method contains(p0: double): boolean public bridge final method contains(p0: java.lang.Object): boolean @@ -23,10 +23,10 @@ public abstract class;Lkot public abstract method lastIndexOf(p0: double): int public bridge final method lastIndexOf(p0: java.lang.Object): int public method remove(p0: int): double - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method set(p0: int, p1: double): java.lang.Double - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public bridge final method size(): int public method toArray(): java.lang.Object[] } @@ -48,10 +48,7 @@ public abstract class<Ljava/lang/Object;Ljava/util/List([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public method remove(p0: java.lang.Object): boolean public bridge final method size(): int public method toArray(): java.lang.Object[] @@ -69,9 +66,9 @@ public abstract class;Lkot public <(Ljava/util/Collection<+Ljava/lang/String;>;)Z> method addAll(p0: java.util.Collection): boolean public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.String): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method clear(): void public bridge final method contains(p0: java.lang.Object): boolean @@ -81,10 +78,10 @@ public abstract class;Lkot public abstract method indexOf(p0: java.lang.String): int public bridge final method lastIndexOf(p0: java.lang.Object): int public abstract method lastIndexOf(p0: java.lang.String): int - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.String public method remove(p0: java.lang.Object): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.String): java.lang.String public bridge final method size(): int public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.ir.txt deleted file mode 100644 index bf1197564c8..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> DoubleListIterator { - // source: 'listIterator.kt' - public method (): void - public method add(p0: double): void - public synthetic bridge method add(p0: java.lang.Object): void - public method hasNext(): boolean - public method next(): java.lang.Double - public synthetic bridge method next(): java.lang.Object - public method remove(): void - public method set(p0: double): void - public synthetic bridge method set(p0: java.lang.Object): void -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/ListIterator;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericListIterator { - // source: 'listIterator.kt' - public <()TT;> method next(): java.lang.Object - public <(TT;)V> method add(p0: java.lang.Object): void - public <(TT;)V> method set(p0: java.lang.Object): void - public method (): void - public method hasNext(): boolean - public method remove(): void -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> StringListIterator { - // source: 'listIterator.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): void - public method add(p0: java.lang.String): void - public method hasNext(): boolean - public synthetic bridge method next(): java.lang.Object - public method next(): java.lang.String - public method remove(): void - public synthetic bridge method set(p0: java.lang.Object): void - public method set(p0: java.lang.String): void -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.txt index a59fe617f16..bf1197564c8 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/listIterator.txt @@ -3,13 +3,13 @@ public abstract class method (): void public method add(p0: double): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method hasNext(): boolean public method next(): java.lang.Double - public synthetic method next(): java.lang.Object + public synthetic bridge method next(): java.lang.Object public method remove(): void public method set(p0: double): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void } @kotlin.Metadata @@ -27,12 +27,12 @@ public abstract class<Ljava/lang/Object;Ljava/util/ListIte public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> StringListIterator { // source: 'listIterator.kt' public method (): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method add(p0: java.lang.String): void public method hasNext(): boolean - public synthetic method next(): java.lang.Object + public synthetic bridge method next(): java.lang.Object public method next(): java.lang.String public method remove(): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void public method set(p0: java.lang.String): void } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.ir.txt deleted file mode 100644 index 8a2fcf912b1..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> ByteShortMapEntry { - // source: 'mapEntry.kt' - public method (): void - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public method setValue(p0: short): java.lang.Short - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericMapEntry { - // source: 'mapEntry.kt' - public <(TV;)TV;> method setValue(p0: java.lang.Object): java.lang.Object - public method (): void - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericStringMapEntry { - // source: 'mapEntry.kt' - public method (): void - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public method setValue(p0: java.lang.String): java.lang.String - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> NumberStringMapEntry { - // source: 'mapEntry.kt' - public method (): void - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public method setValue(p0: java.lang.String): java.lang.String - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMappedMarker;> StringGenericMapEntry { - // source: 'mapEntry.kt' - public <(TV;)TV;> method setValue(p0: java.lang.Object): java.lang.Object - public method (): void - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.txt index 7ac2b7e51a3..8a2fcf912b1 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mapEntry.txt @@ -2,8 +2,9 @@ public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> ByteShortMapEntry { // source: 'mapEntry.kt' public method (): void - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object public method setValue(p0: short): java.lang.Short + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -11,22 +12,25 @@ public abstract class<Ljava/lang/Objec // source: 'mapEntry.kt' public <(TV;)TV;> method setValue(p0: java.lang.Object): java.lang.Object public method (): void + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericStringMapEntry { // source: 'mapEntry.kt' public method (): void - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object public method setValue(p0: java.lang.String): java.lang.String + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> NumberStringMapEntry { // source: 'mapEntry.kt' public method (): void - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object public method setValue(p0: java.lang.String): java.lang.String + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -34,4 +38,5 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map$Ent // source: 'mapEntry.kt' public <(TV;)TV;> method setValue(p0: java.lang.Object): java.lang.Object public method (): void + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.ir.txt deleted file mode 100644 index 36fc4e24d80..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.ir.txt +++ /dev/null @@ -1,34 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> ByteShortMutableMapEntry { - // source: 'mutableMapEntry.kt' - public method (): void - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> GenericMutableMutableMapEntry { - // source: 'mutableMapEntry.kt' - public method (): void - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> GenericStringMutableMapEntry { - // source: 'mutableMapEntry.kt' - public method (): void - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> NumberStringMutableMapEntry { - // source: 'mutableMapEntry.kt' - public method (): void - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> StringGenericMutableMapEntry { - // source: 'mutableMapEntry.kt' - public method (): void - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.txt index 22254fa9c1c..36fc4e24d80 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/mutableMapEntry.txt @@ -2,28 +2,33 @@ public abstract class;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> ByteShortMutableMapEntry { // source: 'mutableMapEntry.kt' public method (): void + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> GenericMutableMutableMapEntry { // source: 'mutableMapEntry.kt' public method (): void + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> GenericStringMutableMapEntry { // source: 'mutableMapEntry.kt' public method (): void + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> NumberStringMutableMapEntry { // source: 'mutableMapEntry.kt' public method (): void + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class<Ljava/lang/Object;Ljava/util/Map$Entry;Lkotlin/jvm/internal/markers/KMutableMap$Entry;> StringGenericMutableMapEntry { // source: 'mutableMapEntry.kt' public method (): void + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.ir.txt deleted file mode 100644 index 128187f9e51..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> NumberStringMap { - // source: 'numberStringMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public <(Ljava/util/Map<+Ljava/lang/Number;+Ljava/lang/String;>;)V> method putAll(p0: java.util.Map): void - public method (): void - public method clear(): void - public abstract method containsKey(p0: java.lang.Number): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.Number): java.lang.String - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public method put(p0: java.lang.Number, p1: java.lang.String): java.lang.String - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.String - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.txt index bfa19e02be4..128187f9e51 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMap.txt @@ -12,13 +12,16 @@ public abstract class method containsValue(p0: java.lang.Object): boolean public abstract method containsValue(p0: java.lang.String): boolean public abstract method get(p0: java.lang.Number): java.lang.String - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public method put(p0: java.lang.Number, p1: java.lang.String): java.lang.String - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.String public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.ir.txt deleted file mode 100644 index 07a7569a056..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMutableMap;> NumberStringMutableMap { - // source: 'numberStringMutableMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public method (): void - public abstract method containsKey(p0: java.lang.Number): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.Number): java.lang.String - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public abstract method remove(p0: java.lang.Number): java.lang.String - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.txt index c774ae142ef..07a7569a056 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/numberStringMutableMap.txt @@ -10,12 +10,15 @@ public abstract class method containsValue(p0: java.lang.Object): boolean public abstract method containsValue(p0: java.lang.String): boolean public abstract method get(p0: java.lang.Number): java.lang.String - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public abstract method remove(p0: java.lang.Number): java.lang.String - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.ir.txt deleted file mode 100644 index c4fe266ad9d..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.ir.txt +++ /dev/null @@ -1,56 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Set;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericSet { - // source: 'set.kt' - public <()Ljava/util/Iterator;> method iterator(): java.util.Iterator - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+TT;>;)Z> method addAll(p0: java.util.Collection): boolean - public <(TT;)Z> method add(p0: java.lang.Object): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public method clear(): void - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> IntSet { - // source: 'set.kt' - public <()Ljava/util/Iterator;> method iterator(): java.util.Iterator - public <(Ljava/util/Collection<+Ljava/lang/Integer;>;)Z> method addAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method clear(): void - public abstract method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMappedMarker;> StringSet { - // source: 'set.kt' - public <()Ljava/util/Iterator;> method iterator(): java.util.Iterator - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method removeAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/Object;>;)Z> method retainAll(p0: java.util.Collection): boolean - public <(Ljava/util/Collection<+Ljava/lang/String;>;)Z> method addAll(p0: java.util.Collection): boolean - public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.txt index 357ef2345ab..c4fe266ad9d 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/set.txt @@ -9,7 +9,6 @@ public abstract class<Ljava/lang/Object;Ljava/util/Set([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method remove(p0: java.lang.Object): boolean public bridge final method size(): int @@ -26,7 +25,7 @@ public abstract class;Lkot public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method clear(): void public abstract method contains(p0: int): boolean public bridge final method contains(p0: java.lang.Object): boolean @@ -45,7 +44,7 @@ public abstract class;Lkotl public <(Ljava/util/Collection<+Ljava/lang/String;>;)Z> method addAll(p0: java.util.Collection): boolean public <([TT;)[TT;> method toArray(p0: java.lang.Object[]): java.lang.Object[] public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method clear(): void public bridge final method contains(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.ir.txt deleted file mode 100644 index 1abab5201c5..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> GenericMap { - // source: 'specializedGenericMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TK;+TV;>;)V> method putAll(p0: java.util.Map): void - public <(TK;TV;)TV;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method (): void - public method clear(): void - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method size(): int - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class;> NumberStringMap { - // source: 'specializedGenericMap.kt' - public method (): void - public abstract method containsKey(p0: java.lang.Number): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.Number): java.lang.String - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.txt index 6658121f473..1abab5201c5 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/specializedGenericMap.txt @@ -9,21 +9,23 @@ public abstract class<Ljava/lang/Objec public <(TK;TV;)TV;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method (): void public method clear(): void - public abstract method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public bridge final method size(): int + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class;> NumberStringMap { // source: 'specializedGenericMap.kt' public method (): void + public abstract method containsKey(p0: java.lang.Number): boolean public bridge final method containsKey(p0: java.lang.Object): boolean public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Object + public abstract method containsValue(p0: java.lang.String): boolean + public abstract method get(p0: java.lang.Number): java.lang.String + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.ir.txt deleted file mode 100644 index 4784334367f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> StringGenericMap { - // source: 'stringGenericMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)TV;> method get(p0: java.lang.Object): java.lang.Object - public <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/lang/String;TV;)TV;> method put(p0: java.lang.String, p1: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+Ljava/lang/String;+TV;>;)V> method putAll(p0: java.util.Map): void - public method (): void - public method clear(): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsKey(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.String): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.txt index cf842b0f3f5..4784334367f 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMap.txt @@ -12,12 +12,12 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map method clear(): void public bridge final method containsKey(p0: java.lang.Object): boolean public abstract method containsKey(p0: java.lang.String): boolean - public abstract method containsValue(p0: java.lang.Object): boolean public abstract method get(p0: java.lang.String): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.ir.txt deleted file mode 100644 index e606c7fba7f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> StringGenericMutableMap { - // source: 'stringGenericMutableMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)TV;> method get(p0: java.lang.Object): java.lang.Object - public bridge final <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsKey(p0: java.lang.String): boolean - public abstract method get(p0: java.lang.String): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public abstract method remove(p0: java.lang.String): java.lang.Object - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.txt index 5c158f2dc03..e606c7fba7f 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/abstractStubSignatures/stringGenericMutableMap.txt @@ -9,7 +9,6 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map method (): void public bridge final method containsKey(p0: java.lang.Object): boolean public abstract method containsKey(p0: java.lang.String): boolean - public abstract method containsValue(p0: java.lang.Object): boolean public abstract method get(p0: java.lang.String): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set @@ -17,4 +16,5 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map method getValues(): java.util.Collection public abstract method remove(p0: java.lang.String): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.ir.txt deleted file mode 100644 index 1dc774d6edd..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.ir.txt +++ /dev/null @@ -1,183 +0,0 @@ -@kotlin.Metadata -public final class DGenericCollection { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericCollectionByList { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericCollectionBySet { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericIterable { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.lang.Iterable - public method (@org.jetbrains.annotations.NotNull p0: java.lang.Iterable): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class DGenericIterator { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.Iterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.Iterator): void - public method hasNext(): boolean - public method next(): java.lang.Object - public method remove(): void -} - -@kotlin.Metadata -public final class DGenericList { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method get(p0: int): java.lang.Object - public method getSize(): int - public method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericListIterator { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.ListIterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public method add(p0: java.lang.Object): void - public method hasNext(): boolean - public method hasPrevious(): boolean - public method next(): java.lang.Object - public method nextIndex(): int - public method previous(): java.lang.Object - public method previousIndex(): int - public method remove(): void - public method set(p0: java.lang.Object): void -} - -@kotlin.Metadata -public final class DGenericMap { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DGenericMapEntry { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.Map$Entry - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map$Entry): void - public method getKey(): java.lang.Object - public method getValue(): java.lang.Object - public method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DGenericSet { - // source: 'collectionByDelegation.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.txt index 575e6efce34..1dc774d6edd 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation.txt @@ -147,6 +147,7 @@ public final class DGenericMap { public method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -157,6 +158,7 @@ public final class DGenericMapEntry { public method getKey(): java.lang.Object public method getValue(): java.lang.Object public method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.ir.txt deleted file mode 100644 index 023009c7dda..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.ir.txt +++ /dev/null @@ -1,213 +0,0 @@ -@kotlin.Metadata -public final class DStringCollection { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringCollectionByList { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringCollectionBySet { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringIterable { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.lang.Iterable - public method (@org.jetbrains.annotations.NotNull p0: java.lang.Iterable): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class DStringIterator { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.Iterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.Iterator): void - public method hasNext(): boolean - public synthetic bridge method next(): java.lang.Object - public @org.jetbrains.annotations.NotNull method next(): java.lang.String - public method remove(): void -} - -@kotlin.Metadata -public final class DStringList { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.String): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public synthetic bridge method get(p0: int): java.lang.Object - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.String - public method getSize(): int - public method indexOf(@org.jetbrains.annotations.NotNull p0: java.lang.String): int - public bridge final method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(@org.jetbrains.annotations.NotNull p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.String - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.String): java.lang.String - public bridge final method size(): int - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringListIterator { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.ListIterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public synthetic bridge method add(p0: java.lang.Object): void - public method add(p0: java.lang.String): void - public method hasNext(): boolean - public method hasPrevious(): boolean - public synthetic bridge method next(): java.lang.Object - public @org.jetbrains.annotations.NotNull method next(): java.lang.String - public method nextIndex(): int - public synthetic bridge method previous(): java.lang.Object - public @org.jetbrains.annotations.NotNull method previous(): java.lang.String - public method previousIndex(): int - public method remove(): void - public synthetic bridge method set(p0: java.lang.Object): void - public method set(p0: java.lang.String): void -} - -@kotlin.Metadata -public final class DStringMap { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(@org.jetbrains.annotations.NotNull p0: java.lang.Number): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Number - public bridge final method get(p0: java.lang.Object): java.lang.Number - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method put(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Number - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DStringMapEntry { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.Map$Entry - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map$Entry): void - public synthetic bridge method getKey(): java.lang.Object - public @org.jetbrains.annotations.NotNull method getKey(): java.lang.String - public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Number - public synthetic bridge method getValue(): java.lang.Object - public method setValue(p0: java.lang.Number): java.lang.Number - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DStringSet { - // source: 'collectionByDelegation2.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.txt index be64d96b0a1..023009c7dda 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2.txt @@ -3,7 +3,7 @@ public final class DStringCollection { // source: 'collectionByDelegation2.kt' private synthetic final field $$delegate_0: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -26,7 +26,7 @@ public final class DStringCollectionByList { // source: 'collectionByDelegation2.kt' private synthetic final field $$delegate_0: java.util.List public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -49,7 +49,7 @@ public final class DStringCollectionBySet { // source: 'collectionByDelegation2.kt' private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -91,9 +91,9 @@ public final class DStringList { // source: 'collectionByDelegation2.kt' private synthetic final field $$delegate_0: java.util.List public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.String): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean @@ -112,12 +112,12 @@ public final class DStringList { public bridge final method lastIndexOf(p0: java.lang.Object): int public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.String public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.String): java.lang.String public bridge final method size(): int public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List @@ -130,7 +130,7 @@ public final class DStringListIterator { // source: 'collectionByDelegation2.kt' private synthetic final field $$delegate_0: java.util.ListIterator public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method add(p0: java.lang.String): void public method hasNext(): boolean public method hasPrevious(): boolean @@ -141,7 +141,7 @@ public final class DStringListIterator { public @org.jetbrains.annotations.NotNull method previous(): java.lang.String public method previousIndex(): int public method remove(): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void public method set(p0: java.lang.String): void } @@ -157,19 +157,22 @@ public final class DStringMap { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Number - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Number + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set public method getSize(): int public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection public method isEmpty(): boolean public bridge final method keySet(): java.util.Set - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method put(p0: java.lang.String, p1: java.lang.Number): java.lang.Number public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Number + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -182,7 +185,8 @@ public final class DStringMapEntry { public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Number public synthetic bridge method getValue(): java.lang.Object public method setValue(p0: java.lang.Number): java.lang.Number - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -190,7 +194,7 @@ public final class DStringSet { // source: 'collectionByDelegation2.kt' private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.ir.txt deleted file mode 100644 index 37ab15cd0ab..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.ir.txt +++ /dev/null @@ -1,234 +0,0 @@ -@kotlin.Metadata -public final class DStringCollection { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringCollectionByList { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringCollectionBySet { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringIterable { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.lang.Iterable - public method (@org.jetbrains.annotations.NotNull p0: java.lang.Iterable): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class DStringIterator { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Iterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.Iterator): void - public method hasNext(): boolean - public synthetic bridge method next(): java.lang.Object - public @org.jetbrains.annotations.NotNull method next(): java.lang.String - public method remove(): void -} - -@kotlin.Metadata -public final class DStringList { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.String): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public synthetic bridge method get(p0: int): java.lang.Object - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.String - public method getSize(): int - public method indexOf(@org.jetbrains.annotations.NotNull p0: java.lang.String): int - public bridge final method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(@org.jetbrains.annotations.NotNull p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.String - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method replaceAll(p0: java.util.function.UnaryOperator): void - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.String): java.lang.String - public bridge final method size(): int - public method sort(p0: java.util.Comparator): void - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DStringListIterator { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.ListIterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public synthetic bridge method add(p0: java.lang.Object): void - public method add(p0: java.lang.String): void - public method hasNext(): boolean - public method hasPrevious(): boolean - public synthetic bridge method next(): java.lang.Object - public @org.jetbrains.annotations.NotNull method next(): java.lang.String - public method nextIndex(): int - public synthetic bridge method previous(): java.lang.Object - public @org.jetbrains.annotations.NotNull method previous(): java.lang.String - public method previousIndex(): int - public method remove(): void - public synthetic bridge method set(p0: java.lang.Object): void - public method set(p0: java.lang.String): void -} - -@kotlin.Metadata -public final class DStringMap { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method compute(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number - public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object - public method computeIfAbsent(p0: java.lang.String, p1: java.util.function.Function): java.lang.Number - public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method computeIfPresent(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(@org.jetbrains.annotations.NotNull p0: java.lang.Number): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Number - public bridge final method get(p0: java.lang.Object): java.lang.Number - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object - public method merge(p0: java.lang.String, p1: java.lang.Number, p2: java.util.function.BiFunction): java.lang.Number - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method put(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method putAll(p0: java.util.Map): void - public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putIfAbsent(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method remove(p0: java.lang.Object): java.lang.Number - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public method replace(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method replace(p0: java.lang.String, p1: java.lang.Number, p2: java.lang.Number): boolean - public method replaceAll(p0: java.util.function.BiFunction): void - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DStringMapEntry { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Map$Entry - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map$Entry): void - public synthetic bridge method getKey(): java.lang.Object - public @org.jetbrains.annotations.NotNull method getKey(): java.lang.String - public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Number - public synthetic bridge method getValue(): java.lang.Object - public method setValue(p0: java.lang.Number): java.lang.Number - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DStringSet { - // source: 'collectionByDelegation2WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.txt index 349032f9bdf..37ab15cd0ab 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation2WithFullJdk.txt @@ -3,7 +3,7 @@ public final class DStringCollection { // source: 'collectionByDelegation2WithFullJdk.kt' private synthetic final field $$delegate_0: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -27,7 +27,7 @@ public final class DStringCollectionByList { // source: 'collectionByDelegation2WithFullJdk.kt' private synthetic final field $$delegate_0: java.util.List public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -51,7 +51,7 @@ public final class DStringCollectionBySet { // source: 'collectionByDelegation2WithFullJdk.kt' private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -94,9 +94,9 @@ public final class DStringList { // source: 'collectionByDelegation2WithFullJdk.kt' private synthetic final field $$delegate_0: java.util.List public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.String): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean @@ -115,13 +115,13 @@ public final class DStringList { public bridge final method lastIndexOf(p0: java.lang.Object): int public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.String public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method replaceAll(p0: java.util.function.UnaryOperator): void public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.String): java.lang.String public bridge final method size(): int public method sort(p0: java.util.Comparator): void @@ -135,7 +135,7 @@ public final class DStringListIterator { // source: 'collectionByDelegation2WithFullJdk.kt' private synthetic final field $$delegate_0: java.util.ListIterator public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method add(p0: java.lang.String): void public method hasNext(): boolean public method hasPrevious(): boolean @@ -146,7 +146,7 @@ public final class DStringListIterator { public @org.jetbrains.annotations.NotNull method previous(): java.lang.String public method previousIndex(): int public method remove(): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void public method set(p0: java.lang.String): void } @@ -156,11 +156,11 @@ public final class DStringMap { private synthetic final field $$delegate_0: java.util.Map public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void public method clear(): void - public synthetic method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method compute(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number - public synthetic method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object + public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object public method computeIfAbsent(p0: java.lang.String, p1: java.util.function.Function): java.lang.Number - public synthetic method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method computeIfPresent(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean public bridge final method containsKey(p0: java.lang.Object): boolean @@ -168,29 +168,32 @@ public final class DStringMap { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Number - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Number + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set public method getSize(): int public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection public method isEmpty(): boolean public bridge final method keySet(): java.util.Set - public synthetic method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object public method merge(p0: java.lang.String, p1: java.lang.Number, p2: java.util.function.BiFunction): java.lang.Number - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method put(p0: java.lang.String, p1: java.lang.Number): java.lang.Number public method putAll(p0: java.util.Map): void - public synthetic method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putIfAbsent(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Number + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean public method replace(p0: java.lang.String, p1: java.lang.Number): java.lang.Number public method replace(p0: java.lang.String, p1: java.lang.Number, p2: java.lang.Number): boolean public method replaceAll(p0: java.util.function.BiFunction): void public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -203,7 +206,8 @@ public final class DStringMapEntry { public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Number public synthetic bridge method getValue(): java.lang.Object public method setValue(p0: java.lang.Number): java.lang.Number - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -211,7 +215,7 @@ public final class DStringSet { // source: 'collectionByDelegation2WithFullJdk.kt' private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.ir.txt deleted file mode 100644 index c17c78d94d0..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.ir.txt +++ /dev/null @@ -1,213 +0,0 @@ -@kotlin.Metadata -public final class DIntCollection { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntCollectionByList { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntCollectionBySet { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntIterable { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.lang.Iterable - public method (@org.jetbrains.annotations.NotNull p0: java.lang.Iterable): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class DIntIterator { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.Iterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.Iterator): void - public method hasNext(): boolean - public @org.jetbrains.annotations.NotNull method next(): java.lang.Integer - public synthetic bridge method next(): java.lang.Object - public method remove(): void -} - -@kotlin.Metadata -public final class DIntList { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: int): boolean - public method add(p0: int, p1: int): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.Integer - public synthetic bridge method get(p0: int): java.lang.Object - public method getSize(): int - public method indexOf(p0: int): int - public bridge final method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(p0: int): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): int - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: int): java.lang.Integer - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntListIterator { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.ListIterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public method add(p0: int): void - public synthetic bridge method add(p0: java.lang.Object): void - public method hasNext(): boolean - public method hasPrevious(): boolean - public @org.jetbrains.annotations.NotNull method next(): java.lang.Integer - public synthetic bridge method next(): java.lang.Object - public method nextIndex(): int - public @org.jetbrains.annotations.NotNull method previous(): java.lang.Integer - public synthetic bridge method previous(): java.lang.Object - public method previousIndex(): int - public method remove(): void - public method set(p0: int): void - public synthetic bridge method set(p0: java.lang.Object): void -} - -@kotlin.Metadata -public final class DIntMap { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public method containsKey(p0: int): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: double): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(p0: int): java.lang.Double - public bridge final method get(p0: java.lang.Object): java.lang.Double - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public method put(p0: int, p1: double): java.lang.Double - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Double - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DIntMapEntry { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.Map$Entry - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map$Entry): void - public @org.jetbrains.annotations.NotNull method getKey(): java.lang.Integer - public synthetic bridge method getKey(): java.lang.Object - public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Double - public synthetic bridge method getValue(): java.lang.Object - public method setValue(p0: double): java.lang.Double - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DIntSet { - // source: 'collectionByDelegation3.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.txt index cdc1fb22b7f..c17c78d94d0 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3.txt @@ -4,7 +4,7 @@ public final class DIntCollection { private synthetic final field $$delegate_0: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean @@ -27,7 +27,7 @@ public final class DIntCollectionByList { private synthetic final field $$delegate_0: java.util.List public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean @@ -50,7 +50,7 @@ public final class DIntCollectionBySet { private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean @@ -93,8 +93,8 @@ public final class DIntList { public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void public method add(p0: int): boolean public method add(p0: int, p1: int): void - public synthetic method add(p0: int, p1: java.lang.Object): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -113,12 +113,12 @@ public final class DIntList { public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): int - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public method set(p0: int, p1: int): java.lang.Integer - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public bridge final method size(): int public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List public method toArray(): java.lang.Object[] @@ -131,7 +131,7 @@ public final class DIntListIterator { private synthetic final field $$delegate_0: java.util.ListIterator public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void public method add(p0: int): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method hasNext(): boolean public method hasPrevious(): boolean public @org.jetbrains.annotations.NotNull method next(): java.lang.Integer @@ -142,7 +142,7 @@ public final class DIntListIterator { public method previousIndex(): int public method remove(): void public method set(p0: int): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void } @kotlin.Metadata @@ -157,7 +157,8 @@ public final class DIntMap { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set public @org.jetbrains.annotations.Nullable method get(p0: int): java.lang.Double - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Double + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set public method getSize(): int @@ -165,11 +166,13 @@ public final class DIntMap { public method isEmpty(): boolean public bridge final method keySet(): java.util.Set public method put(p0: int, p1: double): java.lang.Double - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Double + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -182,7 +185,8 @@ public final class DIntMapEntry { public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Double public synthetic bridge method getValue(): java.lang.Object public method setValue(p0: double): java.lang.Double - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -191,7 +195,7 @@ public final class DIntSet { private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.ir.txt deleted file mode 100644 index 6c8c0b62cd2..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.ir.txt +++ /dev/null @@ -1,234 +0,0 @@ -@kotlin.Metadata -public final class DIntCollection { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntCollectionByList { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntCollectionBySet { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntIterable { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.lang.Iterable - public method (@org.jetbrains.annotations.NotNull p0: java.lang.Iterable): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class DIntIterator { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Iterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.Iterator): void - public method hasNext(): boolean - public @org.jetbrains.annotations.NotNull method next(): java.lang.Integer - public synthetic bridge method next(): java.lang.Object - public method remove(): void -} - -@kotlin.Metadata -public final class DIntList { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: int): boolean - public method add(p0: int, p1: int): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.Integer - public synthetic bridge method get(p0: int): java.lang.Object - public method getSize(): int - public method indexOf(p0: int): int - public bridge final method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(p0: int): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): int - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method replaceAll(p0: java.util.function.UnaryOperator): void - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: int): java.lang.Integer - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method sort(p0: java.util.Comparator): void - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DIntListIterator { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.ListIterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public method add(p0: int): void - public synthetic bridge method add(p0: java.lang.Object): void - public method hasNext(): boolean - public method hasPrevious(): boolean - public @org.jetbrains.annotations.NotNull method next(): java.lang.Integer - public synthetic bridge method next(): java.lang.Object - public method nextIndex(): int - public @org.jetbrains.annotations.NotNull method previous(): java.lang.Integer - public synthetic bridge method previous(): java.lang.Object - public method previousIndex(): int - public method remove(): void - public method set(p0: int): void - public synthetic bridge method set(p0: java.lang.Object): void -} - -@kotlin.Metadata -public final class DIntMap { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public method compute(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Double - public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method computeIfAbsent(p0: java.lang.Integer, p1: java.util.function.Function): java.lang.Double - public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object - public method computeIfPresent(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Double - public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method containsKey(p0: int): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: double): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(p0: int): java.lang.Double - public bridge final method get(p0: java.lang.Object): java.lang.Double - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public method merge(p0: java.lang.Integer, p1: java.lang.Double, p2: java.util.function.BiFunction): java.lang.Double - public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object - public method put(p0: int, p1: double): java.lang.Double - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method putIfAbsent(p0: java.lang.Integer, p1: java.lang.Double): java.lang.Double - public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Double - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public method replace(p0: java.lang.Integer, p1: java.lang.Double): java.lang.Double - public method replace(p0: java.lang.Integer, p1: java.lang.Double, p2: java.lang.Double): boolean - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public method replaceAll(p0: java.util.function.BiFunction): void - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DIntMapEntry { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Map$Entry - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map$Entry): void - public @org.jetbrains.annotations.NotNull method getKey(): java.lang.Integer - public synthetic bridge method getKey(): java.lang.Object - public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Double - public synthetic bridge method getValue(): java.lang.Object - public method setValue(p0: double): java.lang.Double - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DIntSet { - // source: 'collectionByDelegation3WithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.txt index 25ee061ef30..6c8c0b62cd2 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegation3WithFullJdk.txt @@ -4,7 +4,7 @@ public final class DIntCollection { private synthetic final field $$delegate_0: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean @@ -28,7 +28,7 @@ public final class DIntCollectionByList { private synthetic final field $$delegate_0: java.util.List public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean @@ -52,7 +52,7 @@ public final class DIntCollectionBySet { private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean @@ -96,8 +96,8 @@ public final class DIntList { public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void public method add(p0: int): boolean public method add(p0: int, p1: int): void - public synthetic method add(p0: int, p1: java.lang.Object): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -116,13 +116,13 @@ public final class DIntList { public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): int - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method replaceAll(p0: java.util.function.UnaryOperator): void public method retainAll(p0: java.util.Collection): boolean public method set(p0: int, p1: int): java.lang.Integer - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public bridge final method size(): int public method sort(p0: java.util.Comparator): void public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List @@ -136,7 +136,7 @@ public final class DIntListIterator { private synthetic final field $$delegate_0: java.util.ListIterator public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void public method add(p0: int): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method hasNext(): boolean public method hasPrevious(): boolean public @org.jetbrains.annotations.NotNull method next(): java.lang.Integer @@ -147,7 +147,7 @@ public final class DIntListIterator { public method previousIndex(): int public method remove(): void public method set(p0: int): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void } @kotlin.Metadata @@ -157,18 +157,19 @@ public final class DIntMap { public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void public method clear(): void public method compute(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Double - public synthetic method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method computeIfAbsent(p0: java.lang.Integer, p1: java.util.function.Function): java.lang.Double - public synthetic method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object + public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object public method computeIfPresent(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Double - public synthetic method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method containsKey(p0: int): boolean public bridge final method containsKey(p0: java.lang.Object): boolean public method containsValue(p0: double): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set public @org.jetbrains.annotations.Nullable method get(p0: int): java.lang.Double - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Double + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set public method getSize(): int @@ -176,21 +177,23 @@ public final class DIntMap { public method isEmpty(): boolean public bridge final method keySet(): java.util.Set public method merge(p0: java.lang.Integer, p1: java.lang.Double, p2: java.util.function.BiFunction): java.lang.Double - public synthetic method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object public method put(p0: int, p1: double): java.lang.Double - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putAll(p0: java.util.Map): void public method putIfAbsent(p0: java.lang.Integer, p1: java.lang.Double): java.lang.Double - public synthetic method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Double + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean public method replace(p0: java.lang.Integer, p1: java.lang.Double): java.lang.Double public method replace(p0: java.lang.Integer, p1: java.lang.Double, p2: java.lang.Double): boolean - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean public method replaceAll(p0: java.util.function.BiFunction): void public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -203,7 +206,8 @@ public final class DIntMapEntry { public @org.jetbrains.annotations.NotNull method getValue(): java.lang.Double public synthetic bridge method getValue(): java.lang.Object public method setValue(p0: double): java.lang.Double - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -212,7 +216,7 @@ public final class DIntSet { private synthetic final field $$delegate_0: java.util.Set public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public method contains(p0: int): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.ir.txt deleted file mode 100644 index 55647a00805..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.ir.txt +++ /dev/null @@ -1,197 +0,0 @@ -@kotlin.Metadata -public final class DGenericCollection { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericCollectionByList { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericCollectionBySet { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericIterable { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.lang.Iterable - public method (@org.jetbrains.annotations.NotNull p0: java.lang.Iterable): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class DGenericIterator { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Iterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.Iterator): void - public method hasNext(): boolean - public method next(): java.lang.Object - public method remove(): void -} - -@kotlin.Metadata -public final class DGenericList { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.List - public method (@org.jetbrains.annotations.NotNull p0: java.util.List): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method get(p0: int): java.lang.Object - public method getSize(): int - public method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method replaceAll(p0: java.util.function.UnaryOperator): void - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method sort(p0: java.util.Comparator): void - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class DGenericListIterator { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.ListIterator - public method (@org.jetbrains.annotations.NotNull p0: java.util.ListIterator): void - public method add(p0: java.lang.Object): void - public method hasNext(): boolean - public method hasPrevious(): boolean - public method next(): java.lang.Object - public method nextIndex(): int - public method previous(): java.lang.Object - public method previousIndex(): int - public method remove(): void - public method set(p0: java.lang.Object): void -} - -@kotlin.Metadata -public final class DGenericMap { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object - public method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object - public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public method replaceAll(p0: java.util.function.BiFunction): void - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DGenericMapEntry { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Map$Entry - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map$Entry): void - public method getKey(): java.lang.Object - public method getValue(): java.lang.Object - public method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class DGenericSet { - // source: 'collectionByDelegationWithFullJdk.kt' - private synthetic final field $$delegate_0: java.util.Set - public method (@org.jetbrains.annotations.NotNull p0: java.util.Set): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.txt index a025e6a9f1c..55647a00805 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionByDelegationWithFullJdk.txt @@ -161,6 +161,7 @@ public final class DGenericMap { public method replaceAll(p0: java.util.function.BiFunction): void public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -171,6 +172,7 @@ public final class DGenericMapEntry { public method getKey(): java.lang.Object public method getValue(): java.lang.Object public method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.ir.txt deleted file mode 100644 index 49e75eaa2c1..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -@kotlin.Metadata -public final class Test { - // source: 'collectionWithInternalRemove.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public final method remove$main(p0: java.lang.Object): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.txt index 75b22e2155e..49e75eaa2c1 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionWithInternalRemove.txt @@ -11,6 +11,7 @@ public final class Test { public method isEmpty(): boolean public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator public final method remove$main(p0: java.lang.Object): boolean + public bridge final method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public bridge final method size(): int diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.ir.txt deleted file mode 100644 index 4dd80aeb046..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.ir.txt +++ /dev/null @@ -1,156 +0,0 @@ -@kotlin.Metadata -public abstract class AbstractCollection { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AbstractIterable { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public abstract class AbstractIterator { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public method remove(): void -} - -@kotlin.Metadata -public abstract class AbstractList { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.String): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.String): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.String - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method replaceAll(p0: java.util.function.UnaryOperator): void - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.String): java.lang.String - public bridge final method size(): int - public method sort(p0: java.util.Comparator): void - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AbstractListIterator { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): void - public method add(p0: java.lang.String): void - public method hasNext(): boolean - public synthetic bridge method next(): java.lang.Object - public method next(): java.lang.String - public method remove(): void - public synthetic bridge method set(p0: java.lang.Object): void - public method set(p0: java.lang.String): void -} - -@kotlin.Metadata -public abstract class AbstractMap { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public method clear(): void - public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method compute(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number - public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object - public method computeIfAbsent(p0: java.lang.String, p1: java.util.function.Function): java.lang.Number - public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method computeIfPresent(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsKey(p0: java.lang.String): boolean - public abstract method containsValue(p0: java.lang.Number): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Number - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public abstract method get(p0: java.lang.String): java.lang.Number - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object - public method merge(p0: java.lang.String, p1: java.lang.Number, p2: java.util.function.BiFunction): java.lang.Number - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method put(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method putAll(p0: java.util.Map): void - public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putIfAbsent(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method remove(p0: java.lang.Object): java.lang.Number - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public method replace(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method replace(p0: java.lang.String, p1: java.lang.Number, p2: java.lang.Number): boolean - public method replaceAll(p0: java.util.function.BiFunction): void - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class AbstractMapEntry { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public method setValue(p0: java.lang.Number): java.lang.Number - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class AbstractSet { - // source: 'collectionsWithFullJdk.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.txt index 2e3012ebeaf..4dd80aeb046 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/collectionsWithFullJdk.txt @@ -2,7 +2,7 @@ public abstract class AbstractCollection { // source: 'collectionsWithFullJdk.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -37,9 +37,9 @@ public abstract class AbstractIterator { public abstract class AbstractList { // source: 'collectionsWithFullJdk.kt' public method (): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.String): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean @@ -53,13 +53,13 @@ public abstract class AbstractList { public abstract method lastIndexOf(p0: java.lang.String): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.String public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method replaceAll(p0: java.util.function.UnaryOperator): void public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.String): java.lang.String public bridge final method size(): int public method sort(p0: java.util.Comparator): void @@ -72,13 +72,13 @@ public abstract class AbstractList { public abstract class AbstractListIterator { // source: 'collectionsWithFullJdk.kt' public method (): void - public synthetic method add(p0: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): void public method add(p0: java.lang.String): void public method hasNext(): boolean - public synthetic method next(): java.lang.Object + public synthetic bridge method next(): java.lang.Object public method next(): java.lang.String public method remove(): void - public synthetic method set(p0: java.lang.Object): void + public synthetic bridge method set(p0: java.lang.Object): void public method set(p0: java.lang.String): void } @@ -87,40 +87,43 @@ public abstract class AbstractMap { // source: 'collectionsWithFullJdk.kt' public method (): void public method clear(): void - public synthetic method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method compute(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number - public synthetic method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object + public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object public method computeIfAbsent(p0: java.lang.String, p1: java.util.function.Function): java.lang.Number - public synthetic method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method computeIfPresent(p0: java.lang.String, p1: java.util.function.BiFunction): java.lang.Number public bridge final method containsKey(p0: java.lang.Object): boolean public abstract method containsKey(p0: java.lang.String): boolean public abstract method containsValue(p0: java.lang.Number): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Number + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public abstract method get(p0: java.lang.String): java.lang.Number public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public synthetic method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object public method merge(p0: java.lang.String, p1: java.lang.Number, p2: java.util.function.BiFunction): java.lang.Number - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method put(p0: java.lang.String, p1: java.lang.Number): java.lang.Number public method putAll(p0: java.util.Map): void - public synthetic method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putIfAbsent(p0: java.lang.String, p1: java.lang.Number): java.lang.Number - public method remove(p0: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Number + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean public method replace(p0: java.lang.String, p1: java.lang.Number): java.lang.Number public method replace(p0: java.lang.String, p1: java.lang.Number, p2: java.lang.Number): boolean public method replaceAll(p0: java.util.function.BiFunction): void public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -128,14 +131,15 @@ public abstract class AbstractMapEntry { // source: 'collectionsWithFullJdk.kt' public method (): void public method setValue(p0: java.lang.Number): java.lang.Number - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object + public inner class java/util/Map$Entry } @kotlin.Metadata public abstract class AbstractSet { // source: 'collectionsWithFullJdk.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.ir.txt deleted file mode 100644 index f1d98e86ae0..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.Metadata -public final class EmptyList { - // source: 'emptyList.kt' - public final static @org.jetbrains.annotations.NotNull field INSTANCE: EmptyList - static method (): void - private method (): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.Void): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.Void): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.Void): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public synthetic bridge method get(p0: int): java.lang.Object - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.Void - public method getSize(): int - public method hashCode(): int - public method indexOf(@org.jetbrains.annotations.NotNull p0: java.lang.Void): int - public bridge final method indexOf(p0: java.lang.Object): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method lastIndexOf(@org.jetbrains.annotations.NotNull p0: java.lang.Void): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.Void - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.Void): java.lang.Void - public bridge final method size(): int - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public @org.jetbrains.annotations.NotNull method toString(): java.lang.String -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.txt index eb411496569..f1d98e86ae0 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/emptyList.txt @@ -4,9 +4,9 @@ public final class EmptyList { public final static @org.jetbrains.annotations.NotNull field INSTANCE: EmptyList static method (): void private method (): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.Void): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.Void): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean @@ -27,12 +27,12 @@ public final class EmptyList { public bridge final method lastIndexOf(p0: java.lang.Object): int public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.Void public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.Void): java.lang.Void public bridge final method size(): int public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.ir.txt deleted file mode 100644 index bbbabe36b9c..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -@kotlin.Metadata -public abstract class AC { - // source: 'extendingAbstractCollection.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ASet { - // source: 'extendingAbstractCollection.kt' - public method (): void -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.txt index 771efd033e6..bbbabe36b9c 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/extendingAbstractCollection.txt @@ -5,7 +5,6 @@ public abstract class AC { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.ir.txt deleted file mode 100644 index a06280e405e..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -@kotlin.Metadata -public abstract class AMMapSD { - // source: 'inheritingFromAbstractMap.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge method containsValue(p0: double): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Double - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge method get(p0: java.lang.String): java.lang.Double - public bridge final method remove(p0: java.lang.Object): java.lang.Double - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge method remove(p0: java.lang.String): java.lang.Double -} - -@kotlin.Metadata -public abstract class AMapSD { - // source: 'inheritingFromAbstractMap.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge method containsValue(p0: double): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Double - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge method get(p0: java.lang.String): java.lang.Double -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt index b1f248a0427..a06280e405e 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMap.txt @@ -6,9 +6,11 @@ public abstract class AMMapSD { public bridge method containsKey(p0: java.lang.String): boolean public bridge method containsValue(p0: double): boolean public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Double + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public bridge method get(p0: java.lang.String): java.lang.Double - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.Double + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object public bridge method remove(p0: java.lang.String): java.lang.Double } @@ -20,6 +22,7 @@ public abstract class AMapSD { public bridge method containsKey(p0: java.lang.String): boolean public bridge method containsValue(p0: double): boolean public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Double + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public bridge method get(p0: java.lang.String): java.lang.Double } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.ir.txt deleted file mode 100644 index a1222ad681c..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.ir.txt +++ /dev/null @@ -1,33 +0,0 @@ -@kotlin.Metadata -public abstract class AMListD { - // source: 'inheritingFromAbstractMutableList.kt' - public method (): void - public bridge method contains(p0: double): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public bridge method indexOf(p0: double): int - public bridge final method indexOf(p0: java.lang.Object): int - public bridge method lastIndexOf(p0: double): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge method remove(p0: double): boolean - public bridge final method remove(p0: int): double - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method removeAt(p0: int): java.lang.Double - public synthetic bridge method removeAt(p0: int): java.lang.Object -} - -@kotlin.Metadata -public abstract class AMListI { - // source: 'inheritingFromAbstractMutableList.kt' - public method (): void - public bridge method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public bridge method indexOf(p0: int): int - public bridge final method indexOf(p0: java.lang.Object): int - public bridge method lastIndexOf(p0: int): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge final method remove(p0: int): int - public bridge method remove(p0: java.lang.Integer): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method removeAt(p0: int): java.lang.Integer - public synthetic bridge method removeAt(p0: int): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt index cc52b04ac2e..a1222ad681c 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.txt @@ -11,6 +11,7 @@ public abstract class AMListD { public bridge method remove(p0: double): boolean public bridge final method remove(p0: int): double public bridge final method remove(p0: java.lang.Object): boolean + public abstract method removeAt(p0: int): java.lang.Double public synthetic bridge method removeAt(p0: int): java.lang.Object } @@ -27,5 +28,6 @@ public abstract class AMListI { public bridge final method remove(p0: int): int public bridge method remove(p0: java.lang.Integer): boolean public bridge final method remove(p0: java.lang.Object): boolean + public abstract method removeAt(p0: int): java.lang.Integer public synthetic bridge method removeAt(p0: int): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.ir.txt deleted file mode 100644 index 1a36221a69d..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -@kotlin.Metadata -public final class Test { - // source: 'intArrayList.kt' - public method (): void - public bridge method contains(p0: java.lang.Integer): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public bridge method getSize(): int - public bridge method indexOf(p0: java.lang.Integer): int - public bridge final method indexOf(p0: java.lang.Object): int - public bridge method lastIndexOf(p0: java.lang.Integer): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge final method remove(p0: int): java.lang.Integer - public synthetic bridge method remove(p0: int): java.lang.Object - public bridge method remove(p0: java.lang.Integer): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public bridge method removeAt(p0: int): java.lang.Integer - public bridge final method size(): int -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.txt index 3d3d70f93f6..1a36221a69d 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.txt @@ -10,6 +10,7 @@ public final class Test { public bridge method lastIndexOf(p0: java.lang.Integer): int public bridge final method lastIndexOf(p0: java.lang.Object): int public bridge final method remove(p0: int): java.lang.Integer + public synthetic bridge method remove(p0: int): java.lang.Object public bridge method remove(p0: java.lang.Integer): boolean public bridge final method remove(p0: java.lang.Object): boolean public bridge method removeAt(p0: int): java.lang.Integer diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.ir.txt deleted file mode 100644 index 342ea4b02f4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -@kotlin.Metadata -public final class Test1 { - // source: 'kt44233.kt' - private final @org.jetbrains.annotations.NotNull field received: java.util.concurrent.ConcurrentSkipListSet - public method (): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} - -@kotlin.Metadata -public final class Test2 { - // source: 'kt44233.kt' - private final @org.jetbrains.annotations.NotNull field received: java.lang.String[] - public method (): void - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.txt index 9129aa0d9b4..342ea4b02f4 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/kt44233.txt @@ -1,7 +1,7 @@ @kotlin.Metadata public final class Test1 { // source: 'kt44233.kt' - private final field received: java.util.concurrent.ConcurrentSkipListSet + private final @org.jetbrains.annotations.NotNull field received: java.util.concurrent.ConcurrentSkipListSet public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } @@ -9,7 +9,7 @@ public final class Test1 { @kotlin.Metadata public final class Test2 { // source: 'kt44233.kt' - private final field received: java.lang.String[] + private final @org.jetbrains.annotations.NotNull field received: java.lang.String[] public method (): void public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.ir.txt deleted file mode 100644 index e73e9ed5dd1..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.ir.txt +++ /dev/null @@ -1,43 +0,0 @@ -@kotlin.Metadata -public abstract class IntIntMap { - // source: 'mapOfPrimitivesFullJdk.kt' - public method (): void - public method clear(): void - public method compute(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Integer - public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method computeIfAbsent(p0: java.lang.Integer, p1: java.util.function.Function): java.lang.Integer - public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object - public method computeIfPresent(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Integer - public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public abstract method containsKey(p0: int): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: int): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public abstract method get(p0: int): java.lang.Integer - public bridge final method get(p0: java.lang.Object): java.lang.Integer - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public method merge(p0: java.lang.Integer, p1: java.lang.Integer, p2: java.util.function.BiFunction): java.lang.Integer - public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object - public method put(p0: int, p1: int): java.lang.Integer - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method putIfAbsent(p0: java.lang.Integer, p1: java.lang.Integer): java.lang.Integer - public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Integer - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public method replace(p0: java.lang.Integer, p1: java.lang.Integer): java.lang.Integer - public method replace(p0: java.lang.Integer, p1: java.lang.Integer, p2: java.lang.Integer): boolean - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public method replaceAll(p0: java.util.function.BiFunction): void - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.txt index 1dc21417771..e73e9ed5dd1 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/mapOfPrimitivesFullJdk.txt @@ -4,37 +4,40 @@ public abstract class IntIntMap { public method (): void public method clear(): void public method compute(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Integer - public synthetic method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public method computeIfAbsent(p0: java.lang.Integer, p1: java.util.function.Function): java.lang.Integer - public synthetic method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object + public synthetic bridge method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object public method computeIfPresent(p0: java.lang.Integer, p1: java.util.function.BiFunction): java.lang.Integer - public synthetic method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object public abstract method containsKey(p0: int): boolean public bridge final method containsKey(p0: java.lang.Object): boolean public abstract method containsValue(p0: int): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set public abstract method get(p0: int): java.lang.Integer - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.Integer + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set public method merge(p0: java.lang.Integer, p1: java.lang.Integer, p2: java.util.function.BiFunction): java.lang.Integer - public synthetic method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object + public synthetic bridge method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object public method put(p0: int, p1: int): java.lang.Integer - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putAll(p0: java.util.Map): void public method putIfAbsent(p0: java.lang.Integer, p1: java.lang.Integer): java.lang.Integer - public synthetic method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public method remove(p0: java.lang.Object): java.lang.Integer + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean public method replace(p0: java.lang.Integer, p1: java.lang.Integer): java.lang.Integer public method replace(p0: java.lang.Integer, p1: java.lang.Integer, p2: java.lang.Integer): boolean - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public synthetic method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean public method replaceAll(p0: java.util.function.BiFunction): void public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.ir.txt deleted file mode 100644 index cdfaa882228..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.ir.txt +++ /dev/null @@ -1,47 +0,0 @@ -@kotlin.Metadata -public final class MyMap$MySet { - // source: 'noStubsForMapImplementations.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public final inner class MyMap$MySet -} - -@kotlin.Metadata -public final class MyMap { - // source: 'noStubsForMapImplementations.kt' - public method (): void - public method clear(): void - public method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): MyMap$MySet - public synthetic bridge method entrySet(): java.util.Set - public method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): MyMap$MySet - public @org.jetbrains.annotations.NotNull method getKeys(): MyMap$MySet - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.ArrayList - public method isEmpty(): boolean - public bridge final method keySet(): MyMap$MySet - public synthetic bridge method keySet(): java.util.Set - public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int - public bridge final method values(): java.util.ArrayList - public synthetic bridge method values(): java.util.Collection - public final inner class MyMap$MySet - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.txt index 1a1461b94f8..cdfaa882228 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.txt @@ -26,18 +26,22 @@ public final class MyMap { public method clear(): void public method containsKey(p0: java.lang.Object): boolean public method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set + public bridge final method entrySet(): MyMap$MySet + public synthetic bridge method entrySet(): java.util.Set public method get(p0: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.NotNull method getEntries(): MyMap$MySet public @org.jetbrains.annotations.NotNull method getKeys(): MyMap$MySet public method getSize(): int public @org.jetbrains.annotations.NotNull method getValues(): java.util.ArrayList public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set + public bridge final method keySet(): MyMap$MySet + public synthetic bridge method keySet(): java.util.Set public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putAll(p0: java.util.Map): void public method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int - public bridge final method values(): java.util.Collection + public bridge final method values(): java.util.ArrayList + public synthetic bridge method values(): java.util.Collection public final inner class MyMap$MySet + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.ir.txt deleted file mode 100644 index 14f4ccbeb8a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -@kotlin.Metadata -public interface ObservableMap { - // source: 'observableMutableMap.kt' -} - -@kotlin.Metadata -public abstract class ObservableMutableMap { - // source: 'observableMutableMap.kt' - public method (): void - public method clear(): void - public bridge final method entrySet(): java.util.Set - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public final @org.jetbrains.annotations.Nullable method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public final @org.jetbrains.annotations.Nullable method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.txt index e51d2ead58c..14f4ccbeb8a 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.txt @@ -8,10 +8,7 @@ public abstract class ObservableMutableMap { // source: 'observableMutableMap.kt' public method (): void public method clear(): void - public abstract method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean public bridge final method entrySet(): java.util.Set - public abstract method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int @@ -22,4 +19,5 @@ public abstract class ObservableMutableMap { public final @org.jetbrains.annotations.Nullable method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.ir.txt deleted file mode 100644 index a26f8bad14c..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -@kotlin.Metadata -public abstract class AbstractAdd { - // source: 'stubForAbstractFunInAbstractClass.kt' - public method (): void - public abstract method add(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean -} - -@kotlin.Metadata -public abstract class AbstractStringCollection { - // source: 'stubForAbstractFunInAbstractClass.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.txt index 22feed48371..a26f8bad14c 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClass.txt @@ -9,7 +9,7 @@ public abstract class AbstractAdd { public abstract class AbstractStringCollection { // source: 'stubForAbstractFunInAbstractClass.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.ir.txt deleted file mode 100644 index 96862351361..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -@kotlin.Metadata -public abstract class AbstractAdd { - // source: 'stubForAbstractFunInAbstractClassWithCovariantOverride.kt' - public method (): void - public abstract @org.jetbrains.annotations.NotNull method add(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Object -} - -@kotlin.Metadata -public abstract class AbstractStringCollection { - // source: 'stubForAbstractFunInAbstractClassWithCovariantOverride.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): java.lang.Boolean - public synthetic bridge method add(p0: java.lang.String): java.lang.Object - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.txt index aa23f49b16c..96862351361 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubForAbstractFunInAbstractClassWithCovariantOverride.txt @@ -9,8 +9,9 @@ public abstract class AbstractAdd { public abstract class AbstractStringCollection { // source: 'stubForAbstractFunInAbstractClassWithCovariantOverride.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): java.lang.Boolean + public synthetic bridge method add(p0: java.lang.String): java.lang.Object public method addAll(p0: java.util.Collection): boolean public method clear(): void public bridge final method contains(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.ir.txt deleted file mode 100644 index d89d0d6a9df..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.ir.txt +++ /dev/null @@ -1,49 +0,0 @@ -@kotlin.Metadata -public class A { - // source: 'stubsFromSuperclassNoBridges.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public class B { - // source: 'stubsFromSuperclassNoBridges.kt' - public method (): void - public bridge method contains(p0: java.lang.CharSequence): boolean - public bridge final method contains(p0: java.lang.Object): boolean -} - -@kotlin.Metadata -public final class C { - // source: 'stubsFromSuperclassNoBridges.kt' - public method (): void - public method add(p0: int, p1: java.lang.CharSequence): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method addAll(p0: int, p1: java.util.Collection): boolean - public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.CharSequence - public synthetic bridge method get(p0: int): java.lang.Object - public method indexOf(@org.jetbrains.annotations.NotNull p0: java.lang.CharSequence): int - public bridge final method indexOf(p0: java.lang.Object): int - public method lastIndexOf(@org.jetbrains.annotations.NotNull p0: java.lang.CharSequence): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator - public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.CharSequence - public synthetic bridge method remove(p0: int): java.lang.Object - public method set(p0: int, p1: java.lang.CharSequence): java.lang.CharSequence - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.txt index df6ad499f73..d89d0d6a9df 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclassNoBridges.txt @@ -31,7 +31,7 @@ public final class C { // source: 'stubsFromSuperclassNoBridges.kt' public method (): void public method add(p0: int, p1: java.lang.CharSequence): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method addAll(p0: int, p1: java.util.Collection): boolean public @org.jetbrains.annotations.NotNull method get(p0: int): java.lang.CharSequence public synthetic bridge method get(p0: int): java.lang.Object @@ -42,8 +42,8 @@ public final class C { public @org.jetbrains.annotations.NotNull method listIterator(): java.util.ListIterator public @org.jetbrains.annotations.NotNull method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.CharSequence - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method set(p0: int, p1: java.lang.CharSequence): java.lang.CharSequence - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.NotNull method subList(p0: int, p1: int): java.util.List } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.ir.txt deleted file mode 100644 index a429d45fd29..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.ir.txt +++ /dev/null @@ -1,63 +0,0 @@ -@kotlin.Metadata -public final class InternalToArray { - // source: 'customNonGenericToArray.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public final @org.jetbrains.annotations.NotNull method toArray$main(): java.lang.Integer[] - public final method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class PrivateToArray { - // source: 'customNonGenericToArray.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public final @org.jetbrains.annotations.NotNull method toArray(): java.lang.Integer[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class PublicToArray { - // source: 'customNonGenericToArray.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public final @org.jetbrains.annotations.NotNull method toArray(): java.lang.Integer[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.txt index 27cdfa55a92..a429d45fd29 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/customNonGenericToArray.txt @@ -6,7 +6,7 @@ public final class InternalToArray { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.Object): boolean + public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean public method getSize(): int public method isEmpty(): boolean @@ -16,6 +16,7 @@ public final class InternalToArray { public method retainAll(p0: java.util.Collection): boolean public bridge final method size(): int public final @org.jetbrains.annotations.NotNull method toArray$main(): java.lang.Integer[] + public final method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] } @@ -27,7 +28,7 @@ public final class PrivateToArray { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.Object): boolean + public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean public method getSize(): int public method isEmpty(): boolean @@ -48,7 +49,7 @@ public final class PublicToArray { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.Object): boolean + public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean public method getSize(): int public method isEmpty(): boolean diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.ir.txt deleted file mode 100644 index b1af9d73488..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -@kotlin.Metadata -public final class InternalGenericToArray { - // source: 'internalGenericToArray.kt' - private synthetic final field $$delegate_0: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public final @org.jetbrains.annotations.NotNull method toArray$main(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): java.lang.Object[] - public method toArray(): java.lang.Object[] - public final method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.txt index 6d800297f28..b1af9d73488 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/internalGenericToArray.txt @@ -17,4 +17,5 @@ public final class InternalGenericToArray { public bridge final method size(): int public final @org.jetbrains.annotations.NotNull method toArray$main(@org.jetbrains.annotations.NotNull p0: java.lang.Object[]): java.lang.Object[] public method toArray(): java.lang.Object[] + public final method toArray(p0: java.lang.Object[]): java.lang.Object[] } diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.ir.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.ir.txt deleted file mode 100644 index e2bdc6ce56c..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -@kotlin.Metadata -public interface test/A { - // source: 'main.kt' -} - -@kotlin.Metadata -public abstract class test/B { - // source: 'main.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.txt index 9523162f76a..e2bdc6ce56c 100644 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.txt +++ b/compiler/testData/codegen/bytecodeListing/collectionStubs/toArray/noToArrayInJava.txt @@ -10,7 +10,6 @@ public abstract class test/B { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.ir.txt b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.ir.txt deleted file mode 100644 index f83d7ffed9d..00000000000 --- a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.ir.txt +++ /dev/null @@ -1,67 +0,0 @@ -@kotlin.Metadata -public final class TestInternalCompanionInClass$Companion { - // source: 'companionObjectVisibility_after.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public final inner class TestInternalCompanionInClass$Companion -} - -@kotlin.Metadata -public final class TestInternalCompanionInClass { - // source: 'companionObjectVisibility_after.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: TestInternalCompanionInClass$Companion - static method (): void - public method (): void - public final inner class TestInternalCompanionInClass$Companion -} - -@kotlin.Metadata -final class TestPrivateCompanionInClass$Companion { - // source: 'companionObjectVisibility_after.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - private final inner class TestPrivateCompanionInClass$Companion -} - -@kotlin.Metadata -public final class TestPrivateCompanionInClass { - // source: 'companionObjectVisibility_after.kt' - private final static @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInClass$Companion - static method (): void - public method (): void - private final inner class TestPrivateCompanionInClass$Companion -} - -@kotlin.Metadata -final class TestPrivateCompanionInInterface$Companion { - // source: 'companionObjectVisibility_after.kt' - synthetic final static field $$INSTANCE: TestPrivateCompanionInInterface$Companion - static method (): void - private method (): void - public final inner class TestPrivateCompanionInInterface$Companion -} - -@kotlin.Metadata -public interface TestPrivateCompanionInInterface { - // source: 'companionObjectVisibility_after.kt' - public synthetic final static field Companion: TestPrivateCompanionInInterface$Companion - static method (): void - public final inner class TestPrivateCompanionInInterface$Companion -} - -@kotlin.Metadata -public final class TestProtectedCompanionInClass$Companion { - // source: 'companionObjectVisibility_after.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - protected final inner class TestProtectedCompanionInClass$Companion -} - -@kotlin.Metadata -public class TestProtectedCompanionInClass { - // source: 'companionObjectVisibility_after.kt' - protected final static @org.jetbrains.annotations.NotNull field Companion: TestProtectedCompanionInClass$Companion - static method (): void - public method (): void - protected final inner class TestProtectedCompanionInClass$Companion -} diff --git a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt index 35d8171b751..f83d7ffed9d 100644 --- a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt +++ b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_after.txt @@ -44,7 +44,7 @@ final class TestPrivateCompanionInInterface$Companion { @kotlin.Metadata public interface TestPrivateCompanionInInterface { // source: 'companionObjectVisibility_after.kt' - public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestPrivateCompanionInInterface$Companion + public synthetic final static field Companion: TestPrivateCompanionInInterface$Companion static method (): void public final inner class TestPrivateCompanionInInterface$Companion } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.ir.txt deleted file mode 100644 index 808a29972a3..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class CoroutineContextIntrinsicKt$notTailCall$1 { - // source: 'coroutineContextIntrinsic.kt' - enclosing method CoroutineContextIntrinsicKt.notTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1 - method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class CoroutineContextIntrinsicKt { - // source: 'coroutineContextIntrinsic.kt' - inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1 - public final static @org.jetbrains.annotations.Nullable method mustBeTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method retrieveCoroutineContext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.CoroutineContext, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt index 1920ff7472b..808a29972a3 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt @@ -1,5 +1,5 @@ -@kotlin.Metadata @kotlin.coroutines.jvm.internal.DebugMetadata +@kotlin.Metadata final class CoroutineContextIntrinsicKt$notTailCall$1 { // source: 'coroutineContextIntrinsic.kt' enclosing method CoroutineContextIntrinsicKt.notTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.ir.txt deleted file mode 100644 index 2b2f94b3d44..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.ir.txt +++ /dev/null @@ -1,66 +0,0 @@ -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class Controller$multipleSuspensions$1 { - // source: 'coroutineFields.kt' - enclosing method Controller.multipleSuspensions(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: Controller - inner (anonymous) class Controller$multipleSuspensions$1 - method (p0: Controller, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class Controller$nonTailCall$1 { - // source: 'coroutineFields.kt' - enclosing method Controller.nonTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: Controller - inner (anonymous) class Controller$nonTailCall$1 - method (p0: Controller, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class Controller { - // source: 'coroutineFields.kt' - inner (anonymous) class Controller$multipleSuspensions$1 - inner (anonymous) class Controller$nonTailCall$1 - public method (): void - public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class CoroutineFieldsKt$box$1 { - // source: 'coroutineFields.kt' - enclosing method CoroutineFieldsKt.box()Ljava/lang/String; - synthetic final field $result: kotlin.jvm.internal.Ref$ObjectRef - field J$0: long - private synthetic field L$0: java.lang.Object - field L$1: java.lang.Object - field label: int - inner (anonymous) class CoroutineFieldsKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void - public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: Controller, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.Metadata -public final class CoroutineFieldsKt { - // source: 'coroutineFields.kt' - inner (anonymous) class CoroutineFieldsKt$box$1 - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt index 69e6211de5d..2b2f94b3d44 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt @@ -1,5 +1,5 @@ -@kotlin.Metadata @kotlin.coroutines.jvm.internal.DebugMetadata +@kotlin.Metadata final class Controller$multipleSuspensions$1 { // source: 'coroutineFields.kt' enclosing method Controller.multipleSuspensions(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -12,8 +12,8 @@ final class Controller$multipleSuspensions$1 { public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } -@kotlin.Metadata @kotlin.coroutines.jvm.internal.DebugMetadata +@kotlin.Metadata final class Controller$nonTailCall$1 { // source: 'coroutineFields.kt' enclosing method Controller.nonTailCall(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -49,9 +49,11 @@ final class CoroutineFieldsKt$box$1 { field label: int inner (anonymous) class CoroutineFieldsKt$box$1 method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public final method invoke(p0: Controller, p1: kotlin.coroutines.Continuation): java.lang.Object + public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.Metadata @@ -60,4 +62,5 @@ public final class CoroutineFieldsKt { inner (anonymous) class CoroutineFieldsKt$box$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void + public final inner class kotlin/jvm/internal/Ref$ObjectRef } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.ir.txt deleted file mode 100644 index 9dda5a44f25..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class OomInReturnUnitKt$test$1 { - // source: 'oomInReturnUnit.kt' - enclosing method OomInReturnUnitKt.test(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - inner (anonymous) class OomInReturnUnitKt$test$1 - method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class OomInReturnUnitKt { - // source: 'oomInReturnUnit.kt' - inner (anonymous) class OomInReturnUnitKt$test$1 - public final static @org.jetbrains.annotations.Nullable method some(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method test(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt index 7ad7a452a5e..9dda5a44f25 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/oomInReturnUnit.txt @@ -1,5 +1,5 @@ -@kotlin.Metadata @kotlin.coroutines.jvm.internal.DebugMetadata +@kotlin.Metadata final class OomInReturnUnitKt$test$1 { // source: 'oomInReturnUnit.kt' enclosing method OomInReturnUnitKt.test(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.ir.txt deleted file mode 100644 index 58c097b5876..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.ir.txt +++ /dev/null @@ -1,7 +0,0 @@ -@kotlin.Metadata -public final class PrivateAccessorKt { - // source: 'privateAccessor.kt' - public synthetic final static method access$bar(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method bar(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method foo(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt index 83ec3e82d00..58c097b5876 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/privateAccessor.txt @@ -1,6 +1,7 @@ @kotlin.Metadata public final class PrivateAccessorKt { // source: 'privateAccessor.kt' + public synthetic final static method access$bar(p0: kotlin.coroutines.Continuation): java.lang.Object private final static method bar(p0: kotlin.coroutines.Continuation): java.lang.Object private final static method foo(): void } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.ir.txt deleted file mode 100644 index 1a77d18c87d..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -@kotlin.Metadata -public final class A { - // source: 'privateSuspendFun.kt' - public method (): void - public synthetic final static method access$foo(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object - private final method foo(p0: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class PrivateSuspendFunKt { - // source: 'privateSuspendFun.kt' - public synthetic final static method access$foo(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method foo(p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.txt b/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.txt index 77213ee9d05..1a77d18c87d 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/privateSuspendFun.txt @@ -2,11 +2,13 @@ public final class A { // source: 'privateSuspendFun.kt' public method (): void - private final method foo(p0: java.lang.Object): java.lang.Object + public synthetic final static method access$foo(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object + private final method foo(p0: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class PrivateSuspendFunKt { // source: 'privateSuspendFun.kt' - private final static method foo(p0: java.lang.Object): java.lang.Object + public synthetic final static method access$foo(p0: kotlin.coroutines.Continuation): java.lang.Object + private final static method foo(p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.ir.txt deleted file mode 100644 index eec837e4098..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class BooleanParameterKt$box$1 { - // source: 'booleanParameter.kt' - enclosing method BooleanParameterKt.box()Ljava/lang/String; - synthetic final field $lambda: kotlin.jvm.functions.Function2 - synthetic final field $res: kotlin.jvm.internal.Ref$ObjectRef - field L$0: java.lang.Object - field label: int - inner (anonymous) class BooleanParameterKt$box$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.functions.Function2, p2: kotlin.coroutines.Continuation): void - public final method create(p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object - public final method invoke(p0: kotlin.coroutines.Continuation): java.lang.Object - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class BooleanParameterKt$box$lambda$1 { - // source: 'booleanParameter.kt' - enclosing method BooleanParameterKt.box()Ljava/lang/String; - synthetic field Z$0: boolean - field label: int - inner (anonymous) class BooleanParameterKt$box$lambda$1 - method (p0: kotlin.coroutines.Continuation): void - public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: boolean, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class BooleanParameterKt { - // source: 'booleanParameter.kt' - inner (anonymous) class BooleanParameterKt$box$1 - inner (anonymous) class BooleanParameterKt$box$lambda$1 - public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.txt index 98a92fb6a55..eec837e4098 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter.txt @@ -9,9 +9,11 @@ final class BooleanParameterKt$box$1 { field label: int inner (anonymous) class BooleanParameterKt$box$1 method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.functions.Function2, p2: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method create(p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object + public final method invoke(p0: kotlin.coroutines.Continuation): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.coroutines.jvm.internal.DebugMetadata @@ -19,13 +21,14 @@ final class BooleanParameterKt$box$1 { final class BooleanParameterKt$box$lambda$1 { // source: 'booleanParameter.kt' enclosing method BooleanParameterKt.box()Ljava/lang/String; - private synthetic field Z$0: boolean + synthetic field Z$0: boolean field label: int inner (anonymous) class BooleanParameterKt$box$lambda$1 method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public final method invoke(p0: boolean, p1: kotlin.coroutines.Continuation): java.lang.Object + public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -35,4 +38,5 @@ public final class BooleanParameterKt { inner (anonymous) class BooleanParameterKt$box$lambda$1 public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void + public final inner class kotlin/jvm/internal/Ref$ObjectRef } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.ir.txt deleted file mode 100644 index d569a8f9bc8..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class Component1Kt$test$1 { - // source: 'component1.kt' - enclosing method Component1Kt.test()V - private synthetic field L$0: java.lang.Object - field label: int - inner (anonymous) class Component1Kt$test$1 - method (p0: kotlin.coroutines.Continuation): void - public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: Foo, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class Component1Kt { - // source: 'component1.kt' - inner (anonymous) class Component1Kt$test$1 - public final static @org.jetbrains.annotations.NotNull method generate(): Result - public final static method test(): void - public final static method use(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void -} - -@kotlin.Metadata -public final class Foo$DefaultImpls { - // source: 'component1.kt' - public static @org.jetbrains.annotations.Nullable method component1(@org.jetbrains.annotations.NotNull p0: Foo, @org.jetbrains.annotations.NotNull p1: Result, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object - public final inner class Foo$DefaultImpls -} - -@kotlin.Metadata -public interface Foo { - // source: 'component1.kt' - public abstract @org.jetbrains.annotations.Nullable method component1(@org.jetbrains.annotations.NotNull p0: Result, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final inner class Foo$DefaultImpls -} - -@kotlin.Metadata -public interface Result { - // source: 'component1.kt' -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt index dc324dec1f2..d569a8f9bc8 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1.txt @@ -7,9 +7,10 @@ final class Component1Kt$test$1 { field label: int inner (anonymous) class Component1Kt$test$1 method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public final method invoke(p0: Foo, p1: kotlin.coroutines.Continuation): java.lang.Object + public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.kt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.kt index 3e33c4ee461..504ce05adbb 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/destructured.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM fun use(c: suspend (Pair) -> Unit) {} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.ir.txt deleted file mode 100644 index 1fe5eda1573..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.coroutines.jvm.internal.DebugMetadata -@kotlin.Metadata -final class FieldKt$test$1 { - // source: 'field.kt' - enclosing method FieldKt.test()V - private synthetic field L$0: java.lang.Object - field label: int - inner (anonymous) class FieldKt$test$1 - method (p0: kotlin.coroutines.Continuation): void - public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: Foo, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class FieldKt { - // source: 'field.kt' - inner (anonymous) class FieldKt$test$1 - public final static @org.jetbrains.annotations.NotNull method generate(): Result - public final static method test(): void - public final static method use(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): void -} - -@kotlin.Metadata -public final class Foo$DefaultImpls { - // source: 'field.kt' - public static @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: Foo, @org.jetbrains.annotations.NotNull p1: Result): java.lang.Object - public final inner class Foo$DefaultImpls -} - -@kotlin.Metadata -public interface Foo { - // source: 'field.kt' - public abstract @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: Result): java.lang.Object - public final inner class Foo$DefaultImpls -} - -@kotlin.Metadata -public interface Result { - // source: 'field.kt' -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt index 76ed3838455..1fe5eda1573 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field.txt @@ -7,9 +7,10 @@ final class FieldKt$test$1 { field label: int inner (anonymous) class FieldKt$test$1 method (p0: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation - public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method create(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation + public final method invoke(p0: Foo, p1: kotlin.coroutines.Continuation): java.lang.Object + public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.kt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.kt index 38c18c249a1..32c3249da77 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/lambda.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM fun use2(c: suspend Long.(Double, String) -> Unit) {} fun use(c: suspend Long.(String) -> Unit) {} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt index c51c239d423..79eaab79d55 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/select.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM import kotlin.coroutines.* import kotlin.experimental.* diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.kt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.kt index 053eb349583..776dd6694a7 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.kt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/unreachable.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM fun use(c: suspend (String) -> Unit) {} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.ir.txt deleted file mode 100644 index 5ffc865f033..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -@kotlin.Metadata -synthetic final class SuspendConversionKt$test$1 { - // source: 'suspendConversion.kt' - enclosing method SuspendConversionKt.test(Lkotlin/jvm/functions/Function0;)V - inner (anonymous) class SuspendConversionKt$test$1 - method (p0: java.lang.Object): void - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object - public final method invoke(p0: kotlin.coroutines.Continuation): java.lang.Object - public final inner class kotlin/jvm/internal/Intrinsics$Kotlin -} - -@kotlin.Metadata -public final class SuspendConversionKt { - // source: 'suspendConversion.kt' - inner (anonymous) class SuspendConversionKt$test$1 - public synthetic final static method access$test$suspendConversion0(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object - public final static method myApply(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void - private synthetic final static method test$suspendConversion0(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object - public final static method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.txt index cdaab6f916f..5ffc865f033 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/suspendConversion.txt @@ -1,6 +1,20 @@ +@kotlin.Metadata +synthetic final class SuspendConversionKt$test$1 { + // source: 'suspendConversion.kt' + enclosing method SuspendConversionKt.test(Lkotlin/jvm/functions/Function0;)V + inner (anonymous) class SuspendConversionKt$test$1 + method (p0: java.lang.Object): void + public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object + public final method invoke(p0: kotlin.coroutines.Continuation): java.lang.Object + public final inner class kotlin/jvm/internal/Intrinsics$Kotlin +} + @kotlin.Metadata public final class SuspendConversionKt { // source: 'suspendConversion.kt' + inner (anonymous) class SuspendConversionKt$test$1 + public synthetic final static method access$test$suspendConversion0(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object public final static method myApply(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void + private synthetic final static method test$suspendConversion0(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object public final static method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.ir.txt deleted file mode 100644 index de55d9a8cfa..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.ir.txt +++ /dev/null @@ -1,11 +0,0 @@ -@kotlin.Metadata -public abstract class A { - // source: 'suspendImpl.kt' - public method (): void - public @org.jetbrains.annotations.Nullable method internal$main(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - synthetic static method internal$suspendImpl(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object - synthetic static method protected$suspendImpl(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object - protected @org.jetbrains.annotations.Nullable method protected(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - synthetic static method public$suspendImpl(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method public(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.txt index a8e11f0f1c2..de55d9a8cfa 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/suspendImpl.txt @@ -2,10 +2,10 @@ public abstract class A { // source: 'suspendImpl.kt' public method (): void - synthetic static method internal$main$suspendImpl(p0: A, p1: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable method internal$main(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - synthetic static method protected$suspendImpl(p0: A, p1: java.lang.Object): java.lang.Object - protected @org.jetbrains.annotations.Nullable method protected(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object - synthetic static method public$suspendImpl(p0: A, p1: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable method public(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public @org.jetbrains.annotations.Nullable method internal$main(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + synthetic static method internal$suspendImpl(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object + synthetic static method protected$suspendImpl(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object + protected @org.jetbrains.annotations.Nullable method protected(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + synthetic static method public$suspendImpl(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object + public @org.jetbrains.annotations.Nullable method public(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.ir.txt deleted file mode 100644 index df3d01777c5..00000000000 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.ir.txt +++ /dev/null @@ -1,234 +0,0 @@ -@kotlin.Metadata -public interface Flow { - // source: 'tcoContinuation.kt' - public abstract @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public interface FlowCollector { - // source: 'tcoContinuation.kt' - public abstract @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$collect$2$emit$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$collect$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$collect$2$emit$1 - public method (p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$collect$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.collect(LFlow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $action: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$collect$2$emit$1 - public method (p0: kotlin.jvm.functions.Function2): void - public method emit$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$flow$1$collect$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$flow$1 - inner (anonymous) class TcoContinuationKt$flow$1 - inner (anonymous) class TcoContinuationKt$flow$1$collect$1 - public method (p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$flow$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.flow(Lkotlin/jvm/functions/Function2;)LFlow; - synthetic final field $block: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$flow$1 - inner (anonymous) class TcoContinuationKt$flow$1$collect$1 - public method (p0: kotlin.jvm.functions.Function2): void - public method collect$$forInline(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object - public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$collect$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - inner (anonymous) class TcoContinuationKt$foo$$inlined$collect$1 - public method (): void - public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$flow$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - inner (anonymous) class TcoContinuationKt$foo$$inlined$flow$1 - public method (): void - public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -public final class TcoContinuationKt$foo$$inlined$map$1$2$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$foo$$inlined$map$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$foo$$inlined$map$1$2 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 - public method (p0: TcoContinuationKt$foo$$inlined$map$1$2, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$map$1$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$foo$$inlined$map$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 - public method (p0: FlowCollector): void - public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$foo$$inlined$map$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_transform$inlined: Flow - inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1 - public method (p0: Flow): void - public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$1$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$1, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -public final class TcoContinuationKt$map$$inlined$transform$1$2$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$1$2, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$1$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 - public method (p0: FlowCollector, p1: kotlin.jvm.functions.Function2): void - public method emit$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.map(LFlow;Lkotlin/jvm/functions/Function2;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public method collect$$forInline(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object - public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$1, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public method collect$$forInline(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object - public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$lambda$1$$inlined$collect$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1 - inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 - inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 - public method (p0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1, p1: kotlin.coroutines.Continuation): void - public final method invokeSuspend(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 - inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 - public method (p0: kotlin.jvm.functions.Function3, p1: FlowCollector): void - public method emit$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt { - // source: 'tcoContinuation.kt' - inner (anonymous) class TcoContinuationKt$collect$2 - inner (anonymous) class TcoContinuationKt$flow$1 - private final static method collect$$forInline(p0: Flow, p1: kotlin.jvm.functions.Function2, p2: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method flow(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Flow - public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method map(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2): Flow - public final static @org.jetbrains.annotations.NotNull method transform(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function3): Flow -} diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt index 4d1ca50b265..df3d01777c5 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt @@ -20,7 +20,7 @@ public final class TcoContinuationKt$collect$2$emit$1 { inner (anonymous) class TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$collect$2$emit$1 public method (p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -31,8 +31,8 @@ public final class TcoContinuationKt$collect$2 { inner (anonymous) class TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$collect$2$emit$1 public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method emit$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object + public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -45,7 +45,7 @@ public final class TcoContinuationKt$flow$1$collect$1 { inner (anonymous) class TcoContinuationKt$flow$1 inner (anonymous) class TcoContinuationKt$flow$1$collect$1 public method (p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -56,8 +56,8 @@ public final class TcoContinuationKt$flow$1 { inner (anonymous) class TcoContinuationKt$flow$1 inner (anonymous) class TcoContinuationKt$flow$1$collect$1 public method (p0: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect$$forInline(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -66,7 +66,7 @@ public final class TcoContinuationKt$foo$$inlined$collect$1 { enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; inner (anonymous) class TcoContinuationKt$foo$$inlined$collect$1 public method (): void - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -75,7 +75,7 @@ public final class TcoContinuationKt$foo$$inlined$flow$1 { enclosing method TcoContinuationKt.foo(Lkotlin/coroutines/Continuation;)Ljava/lang/Object; inner (anonymous) class TcoContinuationKt$foo$$inlined$flow$1 public method (): void - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -90,7 +90,7 @@ public final class TcoContinuationKt$foo$$inlined$map$1$2$1 { inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 public method (p0: TcoContinuationKt$foo$$inlined$map$1$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -98,11 +98,10 @@ public final class TcoContinuationKt$foo$$inlined$map$1$2 { // source: 'tcoContinuation.kt' enclosing method TcoContinuationKt$foo$$inlined$map$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$foo$$inlined$map$1 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2 inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1$2$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$foo$$inlined$map$1): void - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method (p0: FlowCollector): void + public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -112,7 +111,7 @@ public final class TcoContinuationKt$foo$$inlined$map$1 { synthetic final field $this_transform$inlined: Flow inner (anonymous) class TcoContinuationKt$foo$$inlined$map$1 public method (p0: Flow): void - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -125,7 +124,7 @@ public final class TcoContinuationKt$map$$inlined$transform$1$1 { inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 public method (p0: TcoContinuationKt$map$$inlined$transform$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -140,7 +139,7 @@ public final class TcoContinuationKt$map$$inlined$transform$1$2$1 { inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 public method (p0: TcoContinuationKt$map$$inlined$transform$1$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -148,12 +147,12 @@ public final class TcoContinuationKt$map$$inlined$transform$1$2 { // source: 'tcoContinuation.kt' enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$1 + synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$2$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$map$$inlined$transform$1): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method (p0: FlowCollector, p1: kotlin.jvm.functions.Function2): void + public method emit$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object + public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -165,62 +164,8 @@ public final class TcoContinuationKt$map$$inlined$transform$1 { inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1 inner (anonymous) class TcoContinuationKt$map$$inlined$transform$1$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$2$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -@kotlin.coroutines.jvm.internal.DebugMetadata -public final class TcoContinuationKt$map$$inlined$transform$2$2$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$2$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field L$0: java.lang.Object - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2$1 - public method (p0: TcoContinuationKt$map$$inlined$transform$2$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$2$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$map$$inlined$transform$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$2$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$map$$inlined$transform$2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$map$$inlined$transform$2 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.map(LFlow;Lkotlin/jvm/functions/Function2;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined$1: kotlin.jvm.functions.Function2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2 - inner (anonymous) class TcoContinuationKt$map$$inlined$transform$2$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function2): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect$$forInline(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -233,33 +178,7 @@ public final class TcoContinuationKt$transform$$inlined$flow$1$1 { inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 public method (p0: TcoContinuationKt$transform$$inlined$flow$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$1$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$1$lambda$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$lambda$1$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$1): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -271,112 +190,34 @@ public final class TcoContinuationKt$transform$$inlined$flow$1 { inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1 inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$1$1 public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect$$forInline(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object + public method collect(p0: FlowCollector, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2$1 { +public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$transform$lambda$1$$inlined$collect$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field label: int synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$2, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object + synthetic final field this$0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 + public method (p0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1, p1: kotlin.coroutines.Continuation): void + public final method invokeSuspend(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$2$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$2$lambda$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$2.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$lambda$1$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$2): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$2 { +public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 { // source: 'tcoContinuation.kt' enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_transform$inlined: Flow - synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$2$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$3, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$3$lambda$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - field label: int - synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 - public method (p0: TcoContinuationKt$transform$$inlined$flow$3$lambda$1, p1: kotlin.coroutines.Continuation): void - public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$$inlined$flow$3.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; synthetic final field $this_flow$inlined: FlowCollector - synthetic final field this$0: TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$lambda$1$1 - public method (p0: FlowCollector, p1: TcoContinuationKt$transform$$inlined$flow$3): void - public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class TcoContinuationKt$transform$$inlined$flow$3 { - // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; - synthetic final field $this_transform$inlined: Flow synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3 - inner (anonymous) class TcoContinuationKt$transform$$inlined$flow$3$1 - public method (p0: Flow, p1: kotlin.jvm.functions.Function3): void - public @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: FlowCollector, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 + public method (p0: kotlin.jvm.functions.Function3, p1: FlowCollector): void + public method emit$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object + public method emit(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata @@ -384,7 +225,7 @@ public final class TcoContinuationKt { // source: 'tcoContinuation.kt' inner (anonymous) class TcoContinuationKt$collect$2 inner (anonymous) class TcoContinuationKt$flow$1 - private final static @org.jetbrains.annotations.Nullable method collect$$forInline(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object + private final static method collect$$forInline(p0: Flow, p1: kotlin.jvm.functions.Function2, p2: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.Nullable method collect(@org.jetbrains.annotations.NotNull p0: Flow, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.NotNull method flow(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function2): Flow public final static @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.ir.txt b/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.ir.txt deleted file mode 100644 index 49bd3dce120..00000000000 --- a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.ir.txt +++ /dev/null @@ -1,53 +0,0 @@ -@kotlin.Metadata -synthetic final class C$x$2$1 { - // source: 'delegateMethodIsNonOverridable.kt' - enclosing method C.()V - public final static field INSTANCE: C$x$2$1 - inner (anonymous) class C$x$2$1 - static method (): void - method (): void - public method get(): java.lang.Object -} - -@kotlin.Metadata -public class C { - // source: 'delegateMethodIsNonOverridable.kt' - private final @org.jetbrains.annotations.NotNull field x$delegate: kotlin.reflect.KProperty0 - inner (anonymous) class C$x$2$1 - public method (): void - public method getX(): int - private static method getY$delegate(p0: C): java.lang.Object - public method getY(): int -} - -@kotlin.Metadata -synthetic final class D$x$2$1 { - // source: 'delegateMethodIsNonOverridable.kt' - enclosing method D.()V - public final static field INSTANCE: D$x$2$1 - inner (anonymous) class D$x$2$1 - static method (): void - method (): void - public method get(): java.lang.Object -} - -@kotlin.Metadata -public final class D { - // source: 'delegateMethodIsNonOverridable.kt' - private final @org.jetbrains.annotations.NotNull field x$delegate: kotlin.reflect.KProperty0 - inner (anonymous) class D$x$2$1 - public method (): void - public method getX(): int - private static method getY$delegate(p0: D): java.lang.Object - public method getY(): int -} - -@kotlin.Metadata -public final class DelegateMethodIsNonOverridableKt { - // source: 'delegateMethodIsNonOverridable.kt' - private final static field a: int - private final static field b: int - static method (): void - public final static method getA(): int - public final static method getB(): int -} diff --git a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.txt b/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.txt index 08ebe119ea4..49bd3dce120 100644 --- a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.txt +++ b/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegateMethodIsNonOverridable.txt @@ -1,56 +1,44 @@ @kotlin.Metadata synthetic final class C$x$2$1 { // source: 'delegateMethodIsNonOverridable.kt' - public final static field INSTANCE: kotlin.reflect.KProperty0 + enclosing method C.()V + public final static field INSTANCE: C$x$2$1 + inner (anonymous) class C$x$2$1 static method (): void method (): void - public @org.jetbrains.annotations.Nullable method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class C$y$2 { - // source: 'delegateMethodIsNonOverridable.kt' - public final static field INSTANCE: kotlin.reflect.KProperty0 - static method (): void - method (): void - public @org.jetbrains.annotations.Nullable method get(): java.lang.Object + public method get(): java.lang.Object } @kotlin.Metadata public class C { // source: 'delegateMethodIsNonOverridable.kt' private final @org.jetbrains.annotations.NotNull field x$delegate: kotlin.reflect.KProperty0 - private final @org.jetbrains.annotations.NotNull field y$delegate: kotlin.reflect.KProperty0 + inner (anonymous) class C$x$2$1 public method (): void public method getX(): int + private static method getY$delegate(p0: C): java.lang.Object public method getY(): int } @kotlin.Metadata synthetic final class D$x$2$1 { // source: 'delegateMethodIsNonOverridable.kt' - public final static field INSTANCE: kotlin.reflect.KProperty0 + enclosing method D.()V + public final static field INSTANCE: D$x$2$1 + inner (anonymous) class D$x$2$1 static method (): void method (): void - public @org.jetbrains.annotations.Nullable method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class D$y$2 { - // source: 'delegateMethodIsNonOverridable.kt' - public final static field INSTANCE: kotlin.reflect.KProperty0 - static method (): void - method (): void - public @org.jetbrains.annotations.Nullable method get(): java.lang.Object + public method get(): java.lang.Object } @kotlin.Metadata public final class D { // source: 'delegateMethodIsNonOverridable.kt' private final @org.jetbrains.annotations.NotNull field x$delegate: kotlin.reflect.KProperty0 - private final @org.jetbrains.annotations.NotNull field y$delegate: kotlin.reflect.KProperty0 + inner (anonymous) class D$x$2$1 public method (): void public method getX(): int + private static method getY$delegate(p0: D): java.lang.Object public method getY(): int } diff --git a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.ir.txt b/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.ir.txt deleted file mode 100644 index cbad90712a4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.ir.txt +++ /dev/null @@ -1,74 +0,0 @@ -@kotlin.Metadata -final class DP$provideDelegate$1 { - // source: 'delegatedPropertiesInCompanionObject.kt' - enclosing method DP.provideDelegate(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Lkotlin/Lazy; - public final static field INSTANCE: DP$provideDelegate$1 - inner (anonymous) class DP$provideDelegate$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class DP { - // source: 'delegatedPropertiesInCompanionObject.kt' - inner (anonymous) class DP$provideDelegate$1 - public method (): void - public final @org.jetbrains.annotations.NotNull method provideDelegate(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.reflect.KProperty): kotlin.Lazy -} - -@kotlin.Metadata -public final class H1$Companion { - // source: 'delegatedPropertiesInCompanionObject.kt' - synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] - static method (): void - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public final @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String - public final inner class H1$Companion -} - -@kotlin.Metadata -public final class H1 { - // source: 'delegatedPropertiesInCompanionObject.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: H1$Companion - private final static @org.jetbrains.annotations.NotNull field property$delegate: kotlin.Lazy - static method (): void - public method (): void - public synthetic final static method access$getProperty$delegate$cp(): kotlin.Lazy - public final inner class H1$Companion -} - -@kotlin.Metadata -final class H2$Companion$property$2 { - // source: 'delegatedPropertiesInCompanionObject.kt' - enclosing class H2 - public final static field INSTANCE: H2$Companion$property$2 - inner (anonymous) class H2$Companion$property$2 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class H2$Companion { - // source: 'delegatedPropertiesInCompanionObject.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public final @org.jetbrains.annotations.NotNull method getProperty(): java.lang.String - public final inner class H2$Companion -} - -@kotlin.Metadata -public final class H2 { - // source: 'delegatedPropertiesInCompanionObject.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: H2$Companion - private final static @org.jetbrains.annotations.NotNull field property$delegate: kotlin.Lazy - inner (anonymous) class H2$Companion$property$2 - static method (): void - public method (): void - public synthetic final static method access$getProperty$delegate$cp(): kotlin.Lazy - public final inner class H2$Companion -} diff --git a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.txt b/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.txt index 9d39f7c801a..cbad90712a4 100644 --- a/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.txt +++ b/compiler/testData/codegen/bytecodeListing/delegatedProperty/delegatedPropertiesInCompanionObject.txt @@ -7,7 +7,7 @@ final class DP$provideDelegate$1 { static method (): void method (): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -36,7 +36,7 @@ public final class H1 { private final static @org.jetbrains.annotations.NotNull field property$delegate: kotlin.Lazy static method (): void public method (): void - public synthetic final static method access$getProperty$cp(): kotlin.Lazy + public synthetic final static method access$getProperty$delegate$cp(): kotlin.Lazy public final inner class H1$Companion } @@ -49,7 +49,7 @@ final class H2$Companion$property$2 { static method (): void method (): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata @@ -69,6 +69,6 @@ public final class H2 { inner (anonymous) class H2$Companion$property$2 static method (): void public method (): void - public synthetic final static method access$getProperty$cp(): kotlin.Lazy + public synthetic final static method access$getProperty$delegate$cp(): kotlin.Lazy public final inner class H2$Companion } diff --git a/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.ir.txt b/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.ir.txt deleted file mode 100644 index 9220aaa916f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.ir.txt +++ /dev/null @@ -1,12 +0,0 @@ -@kotlin.Metadata -public final class LocalDelegatedPropertyKt { - // source: 'localDelegatedProperty.kt' - synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] - static method (): void - public synthetic final static method access$foo$lambda-0(p0: java.lang.String): java.lang.String - private final static method foo$lambda-0(p0: java.lang.String): java.lang.String - private final static method foo$lambda-1(p0: java.lang.String, p1: java.lang.String): void - public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String - public final static @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.Nullable p2: java.lang.Object): java.lang.String - public final static method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.Nullable p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: java.lang.String): void -} diff --git a/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.txt b/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.txt index 076966af77d..9220aaa916f 100644 --- a/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.txt +++ b/compiler/testData/codegen/bytecodeListing/delegatedProperty/localDelegatedProperty.txt @@ -1,19 +1,11 @@ -@kotlin.Metadata -public final class LocalDelegatedPropertyKt$foo$x$1 { - // source: 'localDelegatedProperty.kt' - public final static field INSTANCE: kotlin.reflect.KMutableProperty0 - static method (): void - method (): void - public method getName(): java.lang.String - public method getOwner(): kotlin.reflect.KDeclarationContainer - public method getSignature(): java.lang.String -} - @kotlin.Metadata public final class LocalDelegatedPropertyKt { // source: 'localDelegatedProperty.kt' synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] static method (): void + public synthetic final static method access$foo$lambda-0(p0: java.lang.String): java.lang.String + private final static method foo$lambda-0(p0: java.lang.String): java.lang.String + private final static method foo$lambda-1(p0: java.lang.String, p1: java.lang.String): void public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String public final static @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.Nullable p2: java.lang.Object): java.lang.String public final static method setValue(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.Nullable p1: java.lang.Object, @org.jetbrains.annotations.Nullable p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: java.lang.String): void diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt deleted file mode 100644 index 9ebfe7095bd..00000000000 --- a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -@kotlin.Metadata -public final enum class Test { - // source: 'deprecatedEnumEntryFields.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: Test[] - public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY1: Test - public final enum static field ENTRY2: Test - public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY3: Test - private synthetic final static method $values(): Test[] - static method (): void - private method (p0: java.lang.String, p1: int): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public static method valueOf(p0: java.lang.String): Test - public static method values(): Test[] -} diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.txt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.txt index a56b7ed312c..9ebfe7095bd 100644 --- a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.txt +++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.txt @@ -1,12 +1,15 @@ @kotlin.Metadata public final enum class Test { // source: 'deprecatedEnumEntryFields.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: Test[] public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY1: Test public final enum static field ENTRY2: Test public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY3: Test + private synthetic final static method $values(): Test[] static method (): void private method (p0: java.lang.String, p1: int): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Test public static method values(): Test[] } diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.ir.txt b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.ir.txt deleted file mode 100644 index 73e4644be18..00000000000 --- a/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.ir.txt +++ /dev/null @@ -1,84 +0,0 @@ -@kotlin.Metadata -public final class DefaultImpl { - // source: 'inheritingDeprecation.kt' - public method (): void - public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String - public final inner class IFoo$DefaultImpls -} - -@kotlin.Metadata -public final class DefaultImpl2 { - // source: 'inheritingDeprecation.kt' - public method (): void - public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String - public final inner class IFoo2$DefaultImpls -} - -@kotlin.Metadata -public final class Delegated { - // source: 'inheritingDeprecation.kt' - private synthetic final field $$delegate_0: IFoo - public method (@org.jetbrains.annotations.NotNull p0: IFoo): void - public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String -} - -@kotlin.Metadata -public final class Delegated2 { - // source: 'inheritingDeprecation.kt' - private synthetic final field $$delegate_0: IFoo2 - public method (@org.jetbrains.annotations.NotNull p0: IFoo2): void - public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String -} - -@kotlin.Metadata -public final class ExplicitOverride { - // source: 'inheritingDeprecation.kt' - public method (): void - public @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String -} - -@kotlin.Metadata -public final class ExplicitOverride2 { - // source: 'inheritingDeprecation.kt' - public method (): void - public @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getProp(): java.lang.String -} - -@kotlin.Metadata -public final class IFoo$DefaultImpls { - // source: 'inheritingDeprecation.kt' - public synthetic deprecated static @kotlin.Deprecated(message="") method getExtProp$annotations(p0: java.lang.String): void - public deprecated static @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: IFoo, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String - public synthetic deprecated static @kotlin.Deprecated(message="") method getProp$annotations(): void - public deprecated static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: IFoo): java.lang.String - public final inner class IFoo$DefaultImpls -} - -@kotlin.Metadata -public interface IFoo { - // source: 'inheritingDeprecation.kt' - public deprecated abstract @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public deprecated abstract @org.jetbrains.annotations.NotNull method getProp(): java.lang.String - public final inner class IFoo$DefaultImpls -} - -@kotlin.Metadata -public final class IFoo2$DefaultImpls { - // source: 'inheritingDeprecation.kt' - public deprecated static @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: IFoo2, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String - public deprecated static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: IFoo2): java.lang.String - public final inner class IFoo$DefaultImpls - public final inner class IFoo2$DefaultImpls -} - -@kotlin.Metadata -public interface IFoo2 { - // source: 'inheritingDeprecation.kt' - public final inner class IFoo2$DefaultImpls -} diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt index 61b0167b423..73e4644be18 100644 --- a/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt +++ b/compiler/testData/codegen/bytecodeListing/deprecated/inheritingDeprecation.txt @@ -4,6 +4,7 @@ public final class DefaultImpl { public method (): void public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String + public final inner class IFoo$DefaultImpls } @kotlin.Metadata @@ -12,6 +13,7 @@ public final class DefaultImpl2 { public method (): void public deprecated @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String public deprecated @org.jetbrains.annotations.NotNull method getProp(): java.lang.String + public final inner class IFoo2$DefaultImpls } @kotlin.Metadata @@ -71,6 +73,7 @@ public final class IFoo2$DefaultImpls { // source: 'inheritingDeprecation.kt' public deprecated static @org.jetbrains.annotations.NotNull method getExtProp(@org.jetbrains.annotations.NotNull p0: IFoo2, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String public deprecated static @org.jetbrains.annotations.NotNull method getProp(@org.jetbrains.annotations.NotNull p0: IFoo2): java.lang.String + public final inner class IFoo$DefaultImpls public final inner class IFoo2$DefaultImpls } diff --git a/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.ir.txt b/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.ir.txt deleted file mode 100644 index 5cbd3463088..00000000000 --- a/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -@kotlin.Metadata -public final class A$Companion { - // source: 'deprecatedConstantPropertyInterfaceCompanion.kt' - synthetic final static field $$INSTANCE: A$Companion - public deprecated final static @org.jetbrains.annotations.NotNull field s: java.lang.String - static method (): void - private method (): void - public synthetic deprecated static @kotlin.Deprecated(message="no") method getS$annotations(): void - public final inner class A$Companion -} - -@kotlin.Metadata -public interface A { - // source: 'deprecatedConstantPropertyInterfaceCompanion.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: A$Companion - public deprecated final static @org.jetbrains.annotations.NotNull field s: java.lang.String - static method (): void - public final inner class A$Companion -} - -@kotlin.Metadata -public final class B$Companion { - // source: 'deprecatedConstantPropertyInterfaceCompanion.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public synthetic deprecated static @kotlin.Deprecated(message="no") method getS$annotations(): void - public final inner class B$Companion -} - -@kotlin.Metadata -public final class B { - // source: 'deprecatedConstantPropertyInterfaceCompanion.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: B$Companion - public deprecated final static @org.jetbrains.annotations.NotNull field s: java.lang.String - static method (): void - public method (): void - public final inner class B$Companion -} diff --git a/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.txt b/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.txt index 1aadc394e05..5cbd3463088 100644 --- a/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.txt +++ b/compiler/testData/codegen/bytecodeListing/deprecatedConstantPropertyInterfaceCompanion.txt @@ -13,7 +13,7 @@ public final class A$Companion { public interface A { // source: 'deprecatedConstantPropertyInterfaceCompanion.kt' public final static @org.jetbrains.annotations.NotNull field Companion: A$Companion - public final static @kotlin.Deprecated(message="no") @org.jetbrains.annotations.NotNull field s: java.lang.String + public deprecated final static @org.jetbrains.annotations.NotNull field s: java.lang.String static method (): void public final inner class A$Companion } diff --git a/compiler/testData/codegen/bytecodeListing/deserializeLambdaMethod.kt b/compiler/testData/codegen/bytecodeListing/deserializeLambdaMethod.kt index 285c178ab27..288c8abe361 100644 --- a/compiler/testData/codegen/bytecodeListing/deserializeLambdaMethod.kt +++ b/compiler/testData/codegen/bytecodeListing/deserializeLambdaMethod.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND: JVM - // FILE: deserializeLambdaMethod.kt fun plusK(s: String) = s + "K" diff --git a/compiler/testData/codegen/bytecodeListing/enum.ir.txt b/compiler/testData/codegen/bytecodeListing/enum.ir.txt deleted file mode 100644 index a803a25ab10..00000000000 --- a/compiler/testData/codegen/bytecodeListing/enum.ir.txt +++ /dev/null @@ -1,79 +0,0 @@ -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class Ann { - // source: 'enum.kt' -} - -@kotlin.Metadata -public final enum class SimpleEnum { - // source: 'enum.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: SimpleEnum[] - public final enum static field A: SimpleEnum - public final enum static field B: SimpleEnum - public final enum static field C: SimpleEnum - private synthetic final static method $values(): SimpleEnum[] - static method (): void - private method (p0: java.lang.String, p1: int): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public static method valueOf(p0: java.lang.String): SimpleEnum - public static method values(): SimpleEnum[] -} - -@kotlin.Metadata -public final enum class WithAnnotations { - // source: 'enum.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: WithAnnotations[] - public final enum static @Ann field A: WithAnnotations - public final enum static @Ann field B: WithAnnotations - private synthetic final static method $values(): WithAnnotations[] - static method (): void - private method (p0: java.lang.String, p1: int): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public static method valueOf(p0: java.lang.String): WithAnnotations - public static method values(): WithAnnotations[] -} - -@kotlin.Metadata -public final enum class WithConstructor { - // source: 'enum.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: WithConstructor[] - public final enum static field A: WithConstructor - public final enum static field B: WithConstructor - public final enum static field C: WithConstructor - private final @org.jetbrains.annotations.NotNull field x: java.lang.String - private synthetic final static method $values(): WithConstructor[] - static method (): void - private method (p0: java.lang.String, p1: int, p2: java.lang.String): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String - public static method valueOf(p0: java.lang.String): WithConstructor - public static method values(): WithConstructor[] -} - -@kotlin.Metadata -final class WithEntryClass$A { - // source: 'enum.kt' - final inner class WithEntryClass$A - method (p0: java.lang.String, p1: int): void - public method foo(): void -} - -@kotlin.Metadata -public abstract enum class WithEntryClass { - // source: 'enum.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: WithEntryClass[] - public final enum static field A: WithEntryClass - final inner class WithEntryClass$A - private synthetic final static method $values(): WithEntryClass[] - static method (): void - private method (p0: java.lang.String, p1: int): void - public synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public abstract method foo(): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public static method valueOf(p0: java.lang.String): WithEntryClass - public static method values(): WithEntryClass[] -} diff --git a/compiler/testData/codegen/bytecodeListing/enum.txt b/compiler/testData/codegen/bytecodeListing/enum.txt index 1f6433346b7..a803a25ab10 100644 --- a/compiler/testData/codegen/bytecodeListing/enum.txt +++ b/compiler/testData/codegen/bytecodeListing/enum.txt @@ -7,12 +7,15 @@ public annotation class Ann { @kotlin.Metadata public final enum class SimpleEnum { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: SimpleEnum[] public final enum static field A: SimpleEnum public final enum static field B: SimpleEnum public final enum static field C: SimpleEnum + private synthetic final static method $values(): SimpleEnum[] static method (): void private method (p0: java.lang.String, p1: int): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): SimpleEnum public static method values(): SimpleEnum[] } @@ -20,11 +23,14 @@ public final enum class SimpleEnum { @kotlin.Metadata public final enum class WithAnnotations { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: WithAnnotations[] public final enum static @Ann field A: WithAnnotations public final enum static @Ann field B: WithAnnotations + private synthetic final static method $values(): WithAnnotations[] static method (): void private method (p0: java.lang.String, p1: int): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): WithAnnotations public static method values(): WithAnnotations[] } @@ -32,13 +38,16 @@ public final enum class WithAnnotations { @kotlin.Metadata public final enum class WithConstructor { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: WithConstructor[] public final enum static field A: WithConstructor public final enum static field B: WithConstructor public final enum static field C: WithConstructor private final @org.jetbrains.annotations.NotNull field x: java.lang.String + private synthetic final static method $values(): WithConstructor[] static method (): void private method (p0: java.lang.String, p1: int, p2: java.lang.String): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String public static method valueOf(p0: java.lang.String): WithConstructor public static method values(): WithConstructor[] @@ -55,13 +64,16 @@ final class WithEntryClass$A { @kotlin.Metadata public abstract enum class WithEntryClass { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: WithEntryClass[] public final enum static field A: WithEntryClass final inner class WithEntryClass$A + private synthetic final static method $values(): WithEntryClass[] static method (): void private method (p0: java.lang.String, p1: int): void public synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public abstract method foo(): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): WithEntryClass public static method values(): WithEntryClass[] } diff --git a/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_after.kt b/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_after.kt index 2c17fe94ec6..2dc53a3b255 100644 --- a/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_after.kt +++ b/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_after.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM // !LANGUAGE: +PackagePrivateFileClassesWithAllPrivateMembers private fun f() { diff --git a/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_before.kt b/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_before.kt index 60ee71b85f7..ea9b0bbfe7a 100644 --- a/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_before.kt +++ b/compiler/testData/codegen/bytecodeListing/fileClassWithPrivateDeclarationsOnly_before.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// IGNORE_BACKEND: JVM // !LANGUAGE: -PackagePrivateFileClassesWithAllPrivateMembers private fun f() { diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.ir.txt deleted file mode 100644 index 174ea2341fe..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.ir.txt +++ /dev/null @@ -1,82 +0,0 @@ -@kotlin.Metadata -public final class _2Kt$box$$inlined$call$1 { - // source: '1.kt' - enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$$inlined$call$1 - public method (): void - public final method invoke(): java.lang.Object -} - -@kotlin.Metadata -public final class _2Kt$box$$inlined$call$2 { - // source: '1.kt' - enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$$inlined$call$2 - public method (): void - public final method invoke(): java.lang.Object -} - -@kotlin.Metadata -public final class _2Kt$box$lambda$1$$inlined$test$1 { - // source: '1.kt' - enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$lambda$1$$inlined$test$1 - public method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class _2Kt$box$lambda$4$$inlined$call$1 { - // source: '1.kt' - enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$lambda$4$$inlined$call$1 - public method (): void - public final method invoke(): java.lang.Object -} - -@kotlin.Metadata -public final class _2Kt$box$lambda$4$lambda$3$$inlined$test$1 { - // source: '1.kt' - enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$lambda$4$lambda$3$$inlined$test$1 - public method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class _2Kt { - // source: '2.kt' - public final static method box(): void -} - -@kotlin.Metadata -public final class test/_1Kt$call$1 { - // source: '1.kt' - enclosing method test/_1Kt.call(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; - synthetic final field $s: kotlin.jvm.functions.Function0 - inner (anonymous) class test/_1Kt$call$1 - public method (p0: kotlin.jvm.functions.Function0): void - public final method invoke(): java.lang.Object -} - -@kotlin.Metadata -public final class test/_1Kt$test$1 { - // source: '1.kt' - enclosing method test/_1Kt.test(Lkotlin/jvm/functions/Function0;)Lkotlin/jvm/functions/Function0; - synthetic final field $z: kotlin.jvm.functions.Function0 - inner (anonymous) class test/_1Kt$test$1 - public method (p0: kotlin.jvm.functions.Function0): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class test/_1Kt { - // source: '1.kt' - inner (anonymous) class test/_1Kt$call$1 - inner (anonymous) class test/_1Kt$test$1 - public final static method call(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): kotlin.jvm.functions.Function0 -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.txt index ea7858afcd0..174ea2341fe 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.txt @@ -1,13 +1,3 @@ -@kotlin.Metadata -public final class _2Kt$box$$inlined$call$1$lambda$1 { - // source: '1.kt' - enclosing method _2Kt$box$$inlined$call$1.invoke()Ljava/lang/Object; - inner (anonymous) class _2Kt$box$$inlined$call$1$lambda$1 - public method (): void - public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String -} - @kotlin.Metadata public final class _2Kt$box$$inlined$call$1 { // source: '1.kt' @@ -17,25 +7,6 @@ public final class _2Kt$box$$inlined$call$1 { public final method invoke(): java.lang.Object } -@kotlin.Metadata -public final class _2Kt$box$$inlined$call$2$lambda$1$1 { - // source: '1.kt' - enclosing method _2Kt$box$$inlined$call$2$lambda$1.invoke()Ljava/lang/Object; - inner (anonymous) class _2Kt$box$$inlined$call$2$lambda$1$1 - public method (): void - public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class _2Kt$box$$inlined$call$2$lambda$1 { - // source: '1.kt' - enclosing method _2Kt$box$$inlined$call$2.invoke()Ljava/lang/Object; - inner (anonymous) class _2Kt$box$$inlined$call$2$lambda$1 - public method (): void - public final method invoke(): java.lang.Object -} - @kotlin.Metadata public final class _2Kt$box$$inlined$call$2 { // source: '1.kt' @@ -45,6 +16,35 @@ public final class _2Kt$box$$inlined$call$2 { public final method invoke(): java.lang.Object } +@kotlin.Metadata +public final class _2Kt$box$lambda$1$$inlined$test$1 { + // source: '1.kt' + enclosing method _2Kt.box()V + inner (anonymous) class _2Kt$box$lambda$1$$inlined$test$1 + public method (): void + public synthetic bridge method invoke(): java.lang.Object + public final method invoke(): java.lang.String +} + +@kotlin.Metadata +public final class _2Kt$box$lambda$4$$inlined$call$1 { + // source: '1.kt' + enclosing method _2Kt.box()V + inner (anonymous) class _2Kt$box$lambda$4$$inlined$call$1 + public method (): void + public final method invoke(): java.lang.Object +} + +@kotlin.Metadata +public final class _2Kt$box$lambda$4$lambda$3$$inlined$test$1 { + // source: '1.kt' + enclosing method _2Kt.box()V + inner (anonymous) class _2Kt$box$lambda$4$lambda$3$$inlined$test$1 + public method (): void + public synthetic bridge method invoke(): java.lang.Object + public final method invoke(): java.lang.String +} + @kotlin.Metadata public final class _2Kt { // source: '2.kt' @@ -69,7 +69,7 @@ public final class test/_1Kt$test$1 { inner (anonymous) class test/_1Kt$test$1 public method (p0: kotlin.jvm.functions.Function0): void public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method invoke(): java.lang.String } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.ir.txt deleted file mode 100644 index be8967c70e9..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.ir.txt +++ /dev/null @@ -1,62 +0,0 @@ -@kotlin.Metadata -public final class _2Kt$box$1$1$1$q$1 { - // source: '2.kt' - enclosing method _2Kt$box$1$1$1.invoke()V - inner (anonymous) class _2Kt$box$1$1 - inner (anonymous) class _2Kt$box$1$1$1 - inner (anonymous) class _2Kt$box$1$1$1$q$1 - method (): void -} - -@kotlin.Metadata -final class _2Kt$box$1$1$1 { - // source: '2.kt' - enclosing method _2Kt$box$1$1.invoke()V - synthetic final field $s2: kotlin.jvm.internal.Ref$ObjectRef - inner (anonymous) class _2Kt$box$1$1 - inner (anonymous) class _2Kt$box$1$1$1 - inner (anonymous) class _2Kt$box$1$1$1$q$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.Metadata -public final class _2Kt$box$1$1$p$1 { - // source: '2.kt' - enclosing method _2Kt$box$1$1.invoke()V - inner (anonymous) class _2Kt$box$1$1 - inner (anonymous) class _2Kt$box$1$1$p$1 - method (): void -} - -@kotlin.Metadata -final class _2Kt$box$1$1 { - // source: '2.kt' - enclosing method _2Kt.box()V - synthetic final field $s1: kotlin.jvm.internal.Ref$ObjectRef - synthetic final field $s2: kotlin.jvm.internal.Ref$ObjectRef - inner (anonymous) class _2Kt$box$1$1 - inner (anonymous) class _2Kt$box$1$1$1 - inner (anonymous) class _2Kt$box$1$1$p$1 - method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.internal.Ref$ObjectRef): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.Metadata -public final class _2Kt { - // source: '2.kt' - inner (anonymous) class _2Kt$box$1$1 - public final static method box(): void - public final static method eval(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.Metadata -public final class test/_1Kt { - // source: '1.kt' - public final static method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.txt index de4170a0e13..be8967c70e9 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/kt10259.txt @@ -1,54 +1,58 @@ @kotlin.Metadata -public final class _2Kt$box$$inlined$test$lambda$1$1 { +public final class _2Kt$box$1$1$1$q$1 { // source: '2.kt' - enclosing method _2Kt$box$$inlined$test$lambda$1.invoke()V - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$1 + enclosing method _2Kt$box$1$1$1.invoke()V + inner (anonymous) class _2Kt$box$1$1 + inner (anonymous) class _2Kt$box$1$1$1 + inner (anonymous) class _2Kt$box$1$1$1$q$1 method (): void } @kotlin.Metadata -public final class _2Kt$box$$inlined$test$lambda$1$2$1 { +final class _2Kt$box$1$1$1 { // source: '2.kt' - enclosing method _2Kt$box$$inlined$test$lambda$1$2.invoke()V - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$2 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$2$1 - method (): void -} - -@kotlin.Metadata -final class _2Kt$box$$inlined$test$lambda$1$2 { - // source: '2.kt' - enclosing method _2Kt$box$$inlined$test$lambda$1.invoke()V - synthetic final field this$0: _2Kt$box$$inlined$test$lambda$1 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$2 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$2$1 - method (p0: _2Kt$box$$inlined$test$lambda$1): void + enclosing method _2Kt$box$1$1.invoke()V + synthetic final field $s2: kotlin.jvm.internal.Ref$ObjectRef + inner (anonymous) class _2Kt$box$1$1 + inner (anonymous) class _2Kt$box$1$1$1 + inner (anonymous) class _2Kt$box$1$1$1$q$1 + method (p0: kotlin.jvm.internal.Ref$ObjectRef): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.Metadata -final class _2Kt$box$$inlined$test$lambda$1 { +public final class _2Kt$box$1$1$p$1 { + // source: '2.kt' + enclosing method _2Kt$box$1$1.invoke()V + inner (anonymous) class _2Kt$box$1$1 + inner (anonymous) class _2Kt$box$1$1$p$1 + method (): void +} + +@kotlin.Metadata +final class _2Kt$box$1$1 { // source: '2.kt' enclosing method _2Kt.box()V - synthetic final field $s1$inlined: kotlin.jvm.internal.Ref$ObjectRef - synthetic final field $s2$inlined: kotlin.jvm.internal.Ref$ObjectRef - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$1 - inner (anonymous) class _2Kt$box$$inlined$test$lambda$1$2 + synthetic final field $s1: kotlin.jvm.internal.Ref$ObjectRef + synthetic final field $s2: kotlin.jvm.internal.Ref$ObjectRef + inner (anonymous) class _2Kt$box$1$1 + inner (anonymous) class _2Kt$box$1$1$1 + inner (anonymous) class _2Kt$box$1$1$p$1 method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.jvm.internal.Ref$ObjectRef): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.Metadata public final class _2Kt { // source: '2.kt' + inner (anonymous) class _2Kt$box$1$1 public final static method box(): void public final static method eval(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.ir.txt deleted file mode 100644 index 6eacf7131f1..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -@kotlin.Metadata -public interface A { - // source: 'lambdaInInitBlockNoPrimaryConstructor.kt' -} - -@kotlin.Metadata -public interface B { - // source: 'lambdaInInitBlockNoPrimaryConstructor.kt' -} - -@kotlin.Metadata -final class E$lambda$1 { - // source: 'lambdaInInitBlockNoPrimaryConstructor.kt' - enclosing method E.(LA;)V - public final static field INSTANCE: E$lambda$1 - inner (anonymous) class E$lambda$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -public final class E { - // source: 'lambdaInInitBlockNoPrimaryConstructor.kt' - private final field irrelevantField: int - inner (anonymous) class E$lambda$1 - public method (@org.jetbrains.annotations.NotNull p0: A): void - public method (@org.jetbrains.annotations.NotNull p0: B): void - public final method getIrrelevantField(): int -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.txt index a5418dd25e2..6eacf7131f1 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/lambdaInInitBlockNoPrimaryConstructor.txt @@ -11,7 +11,7 @@ public interface B { @kotlin.Metadata final class E$lambda$1 { // source: 'lambdaInInitBlockNoPrimaryConstructor.kt' - enclosing method E.(LB;)V + enclosing method E.(LA;)V public final static field INSTANCE: E$lambda$1 inner (anonymous) class E$lambda$1 static method (): void diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.ir.txt deleted file mode 100644 index 1f30ae0a4af..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.ir.txt +++ /dev/null @@ -1,56 +0,0 @@ -@kotlin.Metadata -public final class _2Kt$box$$inlined$test$1 { - // source: '1.kt' - enclosing method _2Kt.box()V - synthetic final field $captured$inlined: java.lang.String - synthetic final field $z$inlined: kotlin.jvm.internal.Ref$ObjectRef - private final field p: java.lang.String - inner (anonymous) class _2Kt$box$$inlined$test$1 - public method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: java.lang.String): void - public method a(): java.lang.String - public final method getP(): java.lang.String -} - -@kotlin.Metadata -final class _2Kt$box$res$1$1 { - // source: '2.kt' - enclosing method _2Kt.box()V - synthetic final field $captured: java.lang.String - inner (anonymous) class _2Kt$box$res$1$1 - method (p0: java.lang.String): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class _2Kt { - // source: '2.kt' - inner (anonymous) class _2Kt$box$res$1$1 - public final static method box(): void - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.Metadata -public interface test/Z { - // source: '1.kt' - public abstract @org.jetbrains.annotations.NotNull method a(): java.lang.String -} - -@kotlin.Metadata -public final class test/_1Kt$test$1 { - // source: '1.kt' - enclosing method test/_1Kt.test(Lkotlin/jvm/functions/Function0;)Ltest/Z; - synthetic final field $z: kotlin.jvm.functions.Function0 - private final field p: java.lang.String - inner (anonymous) class test/_1Kt$test$1 - public method (p0: kotlin.jvm.functions.Function0): void - public method a(): java.lang.String - public final method getP(): java.lang.String -} - -@kotlin.Metadata -public final class test/_1Kt { - // source: '1.kt' - inner (anonymous) class test/_1Kt$test$1 - public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): test.Z -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.txt index f8293fe6691..1f30ae0a4af 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructor.txt @@ -1,31 +1,33 @@ -@kotlin.Metadata -final class _2Kt$box$$inlined$test$1$lambda$1 { - // source: '2.kt' - enclosing method _2Kt$box$$inlined$test$1.(Lkotlin/jvm/internal/Ref$ObjectRef;Ljava/lang/String;)V - synthetic final field this$0: _2Kt$box$$inlined$test$1 - inner (anonymous) class _2Kt$box$$inlined$test$1$lambda$1 - method (p0: _2Kt$box$$inlined$test$1): void - public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String -} - @kotlin.Metadata public final class _2Kt$box$$inlined$test$1 { // source: '1.kt' enclosing method _2Kt.box()V synthetic final field $captured$inlined: java.lang.String synthetic final field $z$inlined: kotlin.jvm.internal.Ref$ObjectRef - private final @org.jetbrains.annotations.NotNull field p: java.lang.String + private final field p: java.lang.String inner (anonymous) class _2Kt$box$$inlined$test$1 public method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: java.lang.String): void - public @org.jetbrains.annotations.NotNull method a(): java.lang.String - public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String + public method a(): java.lang.String + public final method getP(): java.lang.String +} + +@kotlin.Metadata +final class _2Kt$box$res$1$1 { + // source: '2.kt' + enclosing method _2Kt.box()V + synthetic final field $captured: java.lang.String + inner (anonymous) class _2Kt$box$res$1$1 + method (p0: java.lang.String): void + public synthetic bridge method invoke(): java.lang.Object + public final method invoke(): java.lang.String } @kotlin.Metadata public final class _2Kt { // source: '2.kt' + inner (anonymous) class _2Kt$box$res$1$1 public final static method box(): void + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.Metadata @@ -39,11 +41,11 @@ public final class test/_1Kt$test$1 { // source: '1.kt' enclosing method test/_1Kt.test(Lkotlin/jvm/functions/Function0;)Ltest/Z; synthetic final field $z: kotlin.jvm.functions.Function0 - private final @org.jetbrains.annotations.NotNull field p: java.lang.String + private final field p: java.lang.String inner (anonymous) class test/_1Kt$test$1 public method (p0: kotlin.jvm.functions.Function0): void - public @org.jetbrains.annotations.NotNull method a(): java.lang.String - public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String + public method a(): java.lang.String + public final method getP(): java.lang.String } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.ir.txt deleted file mode 100644 index 75a914d0e7a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.ir.txt +++ /dev/null @@ -1,57 +0,0 @@ -@kotlin.Metadata -public final class _2Kt$box$$inlined$test$1 { - // source: '1.kt' - enclosing method _2Kt.box()V - synthetic final field $captured$inlined: java.lang.String - synthetic final field $z$inlined: kotlin.jvm.internal.Ref$ObjectRef - private final field p: java.lang.String - inner (anonymous) class _2Kt$box$$inlined$test$1 - public method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: java.lang.String): void - public method a(): java.lang.String - public final method getP(): java.lang.String -} - -@kotlin.Metadata -final class _2Kt$box$res$1$1$1 { - // source: '2.kt' - enclosing method _2Kt.box()V - synthetic final field $captured: java.lang.String - inner (anonymous) class _2Kt$box$res$1$1$1 - method (p0: java.lang.String): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): java.lang.String -} - -@kotlin.Metadata -public final class _2Kt { - // source: '2.kt' - inner (anonymous) class _2Kt$box$res$1$1$1 - public final static method box(): void - public final inner class kotlin/jvm/internal/Ref$ObjectRef -} - -@kotlin.Metadata -public interface test/Z { - // source: '1.kt' - public abstract @org.jetbrains.annotations.NotNull method a(): java.lang.String -} - -@kotlin.Metadata -public final class test/_1Kt$test$1 { - // source: '1.kt' - enclosing method test/_1Kt.test(Lkotlin/jvm/functions/Function0;)Ltest/Z; - synthetic final field $z: kotlin.jvm.functions.Function0 - private final field p: java.lang.String - inner (anonymous) class test/_1Kt$test$1 - public method (p0: kotlin.jvm.functions.Function0): void - public method a(): java.lang.String - public final method getP(): java.lang.String -} - -@kotlin.Metadata -public final class test/_1Kt { - // source: '1.kt' - inner (anonymous) class test/_1Kt$test$1 - public final static method call(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): test.Z -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.txt index d12e9010e72..75a914d0e7a 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/transformedConstructorWithNestedInline.txt @@ -1,31 +1,33 @@ -@kotlin.Metadata -final class _2Kt$box$$inlined$test$1$lambda$1 { - // source: '2.kt' - enclosing method _2Kt$box$$inlined$test$1.(Lkotlin/jvm/internal/Ref$ObjectRef;Ljava/lang/String;)V - synthetic final field this$0: _2Kt$box$$inlined$test$1 - inner (anonymous) class _2Kt$box$$inlined$test$1$lambda$1 - method (p0: _2Kt$box$$inlined$test$1): void - public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String -} - @kotlin.Metadata public final class _2Kt$box$$inlined$test$1 { // source: '1.kt' enclosing method _2Kt.box()V synthetic final field $captured$inlined: java.lang.String synthetic final field $z$inlined: kotlin.jvm.internal.Ref$ObjectRef - private final @org.jetbrains.annotations.NotNull field p: java.lang.String + private final field p: java.lang.String inner (anonymous) class _2Kt$box$$inlined$test$1 public method (p0: kotlin.jvm.internal.Ref$ObjectRef, p1: java.lang.String): void - public @org.jetbrains.annotations.NotNull method a(): java.lang.String - public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String + public method a(): java.lang.String + public final method getP(): java.lang.String +} + +@kotlin.Metadata +final class _2Kt$box$res$1$1$1 { + // source: '2.kt' + enclosing method _2Kt.box()V + synthetic final field $captured: java.lang.String + inner (anonymous) class _2Kt$box$res$1$1$1 + method (p0: java.lang.String): void + public synthetic bridge method invoke(): java.lang.Object + public final method invoke(): java.lang.String } @kotlin.Metadata public final class _2Kt { // source: '2.kt' + inner (anonymous) class _2Kt$box$res$1$1$1 public final static method box(): void + public final inner class kotlin/jvm/internal/Ref$ObjectRef } @kotlin.Metadata @@ -39,11 +41,11 @@ public final class test/_1Kt$test$1 { // source: '1.kt' enclosing method test/_1Kt.test(Lkotlin/jvm/functions/Function0;)Ltest/Z; synthetic final field $z: kotlin.jvm.functions.Function0 - private final @org.jetbrains.annotations.NotNull field p: java.lang.String + private final field p: java.lang.String inner (anonymous) class test/_1Kt$test$1 public method (p0: kotlin.jvm.functions.Function0): void - public @org.jetbrains.annotations.NotNull method a(): java.lang.String - public final @org.jetbrains.annotations.NotNull method getP(): java.lang.String + public method a(): java.lang.String + public final method getP(): java.lang.String } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.ir.txt deleted file mode 100644 index fc4f6c63adc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -@kotlin.Metadata -public final class Foo { - // source: 'simpleNamed.kt' - public method (): void - private final method acceptsCrossinline$$forInline(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method acceptsCrossinline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final method generic$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - private final method generic$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method generic(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final method genericWithReified(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final method genericWithReified(p0: kotlin.coroutines.Continuation): java.lang.Object - private final method privateInline(p0: kotlin.coroutines.Continuation): java.lang.Object - private final @kotlin.internal.InlineOnly method shouldNotHaveSuffix(p0: kotlin.coroutines.Continuation): java.lang.Object - private final method simple$$forInline(p0: kotlin.Unit, p1: kotlin.coroutines.Continuation): java.lang.Object - private final method simple$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class SimpleNamedKt { - // source: 'simpleNamed.kt' - private final static method acceptsCrossinline$$forInline(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method acceptsCrossinline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final static method generic$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - private final static method generic$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method generic(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method genericWithReified(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method genericWithReified(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method privateInline(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static @kotlin.internal.InlineOnly method shouldNotHaveSuffix(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static method simple$$forInline(p0: kotlin.Unit, p1: kotlin.coroutines.Continuation): java.lang.Object - private final static method simple$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public final static @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.txt b/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.txt index 24019d1f771..fc4f6c63adc 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/simpleNamed.txt @@ -2,18 +2,18 @@ public final class Foo { // source: 'simpleNamed.kt' public method (): void - private final @org.jetbrains.annotations.Nullable method acceptsCrossinline$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + private final method acceptsCrossinline$$forInline(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object public final @org.jetbrains.annotations.Nullable method acceptsCrossinline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final @org.jetbrains.annotations.Nullable method generic$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - private final @org.jetbrains.annotations.Nullable method generic$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + private final method generic$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object + private final method generic$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object public final @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object public final @org.jetbrains.annotations.Nullable method generic(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public synthetic final method genericWithReified(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object public synthetic final method genericWithReified(p0: kotlin.coroutines.Continuation): java.lang.Object private final method privateInline(p0: kotlin.coroutines.Continuation): java.lang.Object private final @kotlin.internal.InlineOnly method shouldNotHaveSuffix(p0: kotlin.coroutines.Continuation): java.lang.Object - private final @org.jetbrains.annotations.Nullable method simple$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final @org.jetbrains.annotations.Nullable method simple$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + private final method simple$$forInline(p0: kotlin.Unit, p1: kotlin.coroutines.Continuation): java.lang.Object + private final method simple$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object public final @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public final @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } @@ -21,18 +21,18 @@ public final class Foo { @kotlin.Metadata public final class SimpleNamedKt { // source: 'simpleNamed.kt' - private final static @org.jetbrains.annotations.Nullable method acceptsCrossinline$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + private final static method acceptsCrossinline$$forInline(p0: kotlin.jvm.functions.Function0, p1: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.Nullable method acceptsCrossinline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final static @org.jetbrains.annotations.Nullable method generic$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - private final static @org.jetbrains.annotations.Nullable method generic$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object + private final static method generic$$forInline(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object + private final static method generic$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.Nullable method generic(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.Nullable method generic(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public synthetic final static method genericWithReified(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object public synthetic final static method genericWithReified(p0: kotlin.coroutines.Continuation): java.lang.Object private final static method privateInline(p0: kotlin.coroutines.Continuation): java.lang.Object private final static @kotlin.internal.InlineOnly method shouldNotHaveSuffix(p0: kotlin.coroutines.Continuation): java.lang.Object - private final static @org.jetbrains.annotations.Nullable method simple$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - private final static @org.jetbrains.annotations.Nullable method simple$$forInline(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + private final static method simple$$forInline(p0: kotlin.Unit, p1: kotlin.coroutines.Continuation): java.lang.Object + private final static method simple$$forInline(p0: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.Unit, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public final static @org.jetbrains.annotations.Nullable method simple(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.ir.txt b/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.ir.txt deleted file mode 100644 index b6a676c9403..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -@kotlin.Metadata -public final class A { - // source: 'suspendInlineReified.kt' - public method (): void - public synthetic final method internalFun$main(p0: kotlin.coroutines.Continuation): java.lang.Object - private synthetic final method privateFun(p0: kotlin.coroutines.Continuation): java.lang.Object - protected synthetic final method protectedFun(p0: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final method publicFun(p0: kotlin.coroutines.Continuation): java.lang.Object -} - -@kotlin.Metadata -public final class SuspendInlineReifiedKt { - // source: 'suspendInlineReified.kt' - public synthetic final static method internalFun(p0: kotlin.coroutines.Continuation): java.lang.Object - private synthetic final static method privateFun(p0: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method publicFun(p0: kotlin.coroutines.Continuation): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.txt b/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.txt index 3ff5456c81f..b6a676c9403 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/suspendInlineReified.txt @@ -2,16 +2,16 @@ public final class A { // source: 'suspendInlineReified.kt' public method (): void - public synthetic final method internalFun$main(p0: java.lang.Object): java.lang.Object - private synthetic final method privateFun(p0: java.lang.Object): java.lang.Object - protected synthetic final method protectedFun(p0: java.lang.Object): java.lang.Object - public synthetic final method publicFun(p0: java.lang.Object): java.lang.Object + public synthetic final method internalFun$main(p0: kotlin.coroutines.Continuation): java.lang.Object + private synthetic final method privateFun(p0: kotlin.coroutines.Continuation): java.lang.Object + protected synthetic final method protectedFun(p0: kotlin.coroutines.Continuation): java.lang.Object + public synthetic final method publicFun(p0: kotlin.coroutines.Continuation): java.lang.Object } @kotlin.Metadata public final class SuspendInlineReifiedKt { // source: 'suspendInlineReified.kt' - public synthetic final static method internalFun(p0: java.lang.Object): java.lang.Object - private synthetic final static method privateFun(p0: java.lang.Object): java.lang.Object - public synthetic final static method publicFun(p0: java.lang.Object): java.lang.Object + public synthetic final static method internalFun(p0: kotlin.coroutines.Continuation): java.lang.Object + private synthetic final static method privateFun(p0: kotlin.coroutines.Continuation): java.lang.Object + public synthetic final static method publicFun(p0: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.ir.txt deleted file mode 100644 index 1034ca5a18f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.ir.txt +++ /dev/null @@ -1,131 +0,0 @@ -@kotlin.Metadata -public interface KBar2 { - // source: 'javaDefaultInterfaceMember.kt' -} - -@kotlin.Metadata -public interface KFoo2 { - // source: 'javaDefaultInterfaceMember.kt' -} - -@kotlin.Metadata -public final class KFoo3$DefaultImpls { - // source: 'javaDefaultInterfaceMember.kt' - public static method foo(@org.jetbrains.annotations.NotNull p0: KFoo3): void - public final inner class KFoo3$DefaultImpls -} - -@kotlin.Metadata -public interface KFoo3 { - // source: 'javaDefaultInterfaceMember.kt' - public abstract method foo(): void - public final inner class KFoo3$DefaultImpls -} - -@kotlin.Metadata -public interface KFooUnrelated { - // source: 'javaDefaultInterfaceMember.kt' - public abstract method foo(): void -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class TestBar1 { - // source: 'javaDefaultInterfaceMember.kt' - private final field x: int - private synthetic method (p0: int): void - public method bar(): void - public static method bar-impl(p0: int): void - public synthetic final static method box-impl(p0: int): TestBar1 - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class TestBar2 { - // source: 'javaDefaultInterfaceMember.kt' - private final field x: int - private synthetic method (p0: int): void - public method bar(): void - public static method bar-impl(p0: int): void - public synthetic final static method box-impl(p0: int): TestBar2 - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class TestFoo1 { - // source: 'javaDefaultInterfaceMember.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): TestFoo1 - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class TestFoo2 { - // source: 'javaDefaultInterfaceMember.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): TestFoo2 - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class TestFoo3 { - // source: 'javaDefaultInterfaceMember.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): TestFoo3 - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public method foo(): void - public static method foo-impl(p0: int): void - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int - public final inner class KFoo3$DefaultImpls -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.txt index 0b72b8b2180..1034ca5a18f 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.txt @@ -127,4 +127,5 @@ public final class TestFoo3 { public method toString(): java.lang.String public static method toString-impl(p0: int): java.lang.String public synthetic final method unbox-impl(): int + public final inner class KFoo3$DefaultImpls } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.ir.txt deleted file mode 100644 index bf113ff24b6..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.ir.txt +++ /dev/null @@ -1,60 +0,0 @@ -@kotlin.Metadata -public final class IFoo$DefaultImpls { - // source: 'defaultInterfaceMethodsInInlineClass.kt' - public static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: IFoo, p1: java.lang.Object): java.lang.String - public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: IFoo, p1: java.lang.Object): java.lang.String - public synthetic static method withDefault$default(p0: IFoo, p1: java.lang.Object, p2: int, p3: int, p4: java.lang.Object): java.lang.String - public static @org.jetbrains.annotations.NotNull method withDefault(@org.jetbrains.annotations.NotNull p0: IFoo, p1: java.lang.Object, p2: int): java.lang.String - public final inner class IFoo$DefaultImpls -} - -@kotlin.Metadata -public interface IFoo { - // source: 'defaultInterfaceMethodsInInlineClass.kt' - public abstract @org.jetbrains.annotations.NotNull method bar(p0: java.lang.Object): java.lang.String - public abstract @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String - public abstract @org.jetbrains.annotations.NotNull method withDefault(p0: java.lang.Object, p1: int): java.lang.String - public final inner class IFoo$DefaultImpls -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class L { - // source: 'defaultInterfaceMethodsInInlineClass.kt' - private final field x: long - private synthetic method (p0: long): void - public synthetic bridge method bar(p0: java.lang.Object): java.lang.String - public @org.jetbrains.annotations.NotNull method bar--h0D71M(p0: long): java.lang.String - public static @org.jetbrains.annotations.NotNull method bar--h0D71M(p0: long, p1: long): java.lang.String - public synthetic final static method box-impl(p0: long): L - public static method constructor-impl(p0: long): long - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: long, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: long, p1: long): boolean - public synthetic bridge method foo(p0: java.lang.Object): java.lang.String - public @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long): java.lang.String - public static @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long, p1: long): java.lang.String - public final method getX(): long - public method hashCode(): int - public static method hashCode-impl(p0: long): int - public method toString(): java.lang.String - public static method toString-impl(p0: long): java.lang.String - public synthetic final method unbox-impl(): long - public synthetic bridge method withDefault(p0: java.lang.Object, p1: int): java.lang.String - public @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: int): java.lang.String - public static @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: long, p2: int): java.lang.String - public final inner class IFoo$DefaultImpls -} - -@kotlin.Metadata -public final class X { - // source: 'defaultInterfaceMethodsInInlineClass.kt' - public method (): void - public synthetic bridge method bar(p0: java.lang.Object): java.lang.String - public @org.jetbrains.annotations.NotNull method bar--h0D71M(p0: long): java.lang.String - public synthetic bridge method foo(p0: java.lang.Object): java.lang.String - public @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long): java.lang.String - public synthetic bridge method withDefault(p0: java.lang.Object, p1: int): java.lang.String - public @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: int): java.lang.String - public final inner class IFoo$DefaultImpls -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt index 3b22c446f02..bf113ff24b6 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt @@ -43,6 +43,7 @@ public final class L { public synthetic bridge method withDefault(p0: java.lang.Object, p1: int): java.lang.String public @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: int): java.lang.String public static @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: long, p2: int): java.lang.String + public final inner class IFoo$DefaultImpls } @kotlin.Metadata @@ -55,4 +56,5 @@ public final class X { public @org.jetbrains.annotations.NotNull method foo--h0D71M(p0: long): java.lang.String public synthetic bridge method withDefault(p0: java.lang.Object, p1: int): java.lang.String public @org.jetbrains.annotations.NotNull method withDefault-7bZmAKo(p0: long, p1: int): java.lang.String + public final inner class IFoo$DefaultImpls } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.ir.txt deleted file mode 100644 index 4cf80234401..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class InlineCharSequence { - // source: 'inlineCharSequence.kt' - private final @org.jetbrains.annotations.NotNull field cs: java.lang.CharSequence - private synthetic method (p0: java.lang.CharSequence): void - public synthetic final static method box-impl(p0: java.lang.CharSequence): InlineCharSequence - public bridge final method charAt(p0: int): char - public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.CharSequence): java.lang.CharSequence - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.lang.CharSequence, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.lang.CharSequence, p1: java.lang.CharSequence): boolean - public method get(p0: int): char - public static method get-impl(p0: java.lang.CharSequence, p1: int): char - public method getLength(): int - public static method getLength-impl(p0: java.lang.CharSequence): int - public method hashCode(): int - public static method hashCode-impl(p0: java.lang.CharSequence): int - public synthetic bridge method length(): int - public @org.jetbrains.annotations.NotNull method subSequence(p0: int, p1: int): java.lang.CharSequence - public static @org.jetbrains.annotations.NotNull method subSequence-impl(p0: java.lang.CharSequence, p1: int, p2: int): java.lang.CharSequence - public method toString(): java.lang.String - public static method toString-impl(p0: java.lang.CharSequence): java.lang.String - public synthetic final method unbox-impl(): java.lang.CharSequence -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.txt index 085c033d024..4cf80234401 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.txt @@ -2,7 +2,7 @@ @kotlin.Metadata public final class InlineCharSequence { // source: 'inlineCharSequence.kt' - private final field cs: java.lang.CharSequence + private final @org.jetbrains.annotations.NotNull field cs: java.lang.CharSequence private synthetic method (p0: java.lang.CharSequence): void public synthetic final static method box-impl(p0: java.lang.CharSequence): InlineCharSequence public bridge final method charAt(p0: int): char @@ -16,7 +16,7 @@ public final class InlineCharSequence { public static method getLength-impl(p0: java.lang.CharSequence): int public method hashCode(): int public static method hashCode-impl(p0: java.lang.CharSequence): int - public bridge final method length(): int + public synthetic bridge method length(): int public @org.jetbrains.annotations.NotNull method subSequence(p0: int, p1: int): java.lang.CharSequence public static @org.jetbrains.annotations.NotNull method subSequence-impl(p0: java.lang.CharSequence, p1: int, p2: int): java.lang.CharSequence public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt deleted file mode 100644 index cbef9b02fe8..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt +++ /dev/null @@ -1,99 +0,0 @@ -@kotlin.Metadata -public interface PrivateMarker { - // source: 'inlineClassTypeParametersInConstructor.kt' -} - -@kotlin.Metadata -public interface ProtectedMarker { - // source: 'inlineClassTypeParametersInConstructor.kt' -} - -@kotlin.Metadata -public interface PublicMarker { - // source: 'inlineClassTypeParametersInConstructor.kt' -} - -@kotlin.Metadata -public class TestBasic { - // source: 'inlineClassTypeParametersInConstructor.kt' - private final field z: int - private method (p0: int): void - private method (p0: int, p1: PrivateMarker): void - private method (p0: int, p1: ProtectedMarker): void - public synthetic method (p0: int, p1: ProtectedMarker, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - private method (p0: int, p1: PublicMarker): void - public synthetic method (p0: int, p1: PublicMarker, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public synthetic method (p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void - public final method getZ-a_XrcN0(): int -} - -@kotlin.Metadata -public final enum class TestEnum { - // source: 'inlineClassTypeParametersInConstructor.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: TestEnum[] - public final enum static field ANSWER: TestEnum - private final field z: int - private synthetic final static method $values(): TestEnum[] - static method (): void - private method (p0: java.lang.String, p1: int, p2: int): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public final method getZ-a_XrcN0(): int - public static method valueOf(p0: java.lang.String): TestEnum - public static method values(): TestEnum[] -} - -@kotlin.Metadata -public final class TestInner$Inner { - // source: 'inlineClassTypeParametersInConstructor.kt' - synthetic final field this$0: TestInner - private final field z: int - private method (p0: TestInner, p1: int): void - public synthetic method (p0: TestInner, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void - public final method getZ-a_XrcN0(): int - public final inner class TestInner$Inner -} - -@kotlin.Metadata -public final class TestInner { - // source: 'inlineClassTypeParametersInConstructor.kt' - public method (): void - public final inner class TestInner$Inner -} - -@kotlin.Metadata -public final class TestSealed$Case { - // source: 'inlineClassTypeParametersInConstructor.kt' - private method (p0: int): void - public synthetic method (p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void - public final inner class TestSealed$Case -} - -@kotlin.Metadata -public abstract class TestSealed { - // source: 'inlineClassTypeParametersInConstructor.kt' - private final field z: int - private method (p0: int): void - public synthetic method (p0: int, p1: kotlin.jvm.internal.DefaultConstructorMarker): void - public final method getZ-a_XrcN0(): int - public final inner class TestSealed$Case -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class Z { - // source: 'inlineClassTypeParametersInConstructor.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): Z - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt index 1ece1222078..cbef9b02fe8 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt @@ -30,11 +30,14 @@ public class TestBasic { @kotlin.Metadata public final enum class TestEnum { // source: 'inlineClassTypeParametersInConstructor.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: TestEnum[] public final enum static field ANSWER: TestEnum private final field z: int + private synthetic final static method $values(): TestEnum[] static method (): void private method (p0: java.lang.String, p1: int, p2: int): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public final method getZ-a_XrcN0(): int public static method valueOf(p0: java.lang.String): TestEnum public static method values(): TestEnum[] diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.ir.txt deleted file mode 100644 index 0c1b909eada..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.ir.txt +++ /dev/null @@ -1,59 +0,0 @@ -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class UInt { - // source: 'UIntArrayWithFullJdk.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): UInt - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -@kotlin.jvm.JvmInline -@kotlin.Metadata -public final class UIntArray { - // source: 'UIntArrayWithFullJdk.kt' - private final @org.jetbrains.annotations.NotNull field storage: int[] - private synthetic method (p0: int[]): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-fLmw4x8(p0: int): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: int[]): UIntArray - public method clear(): void - public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: int[]): int[] - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-fLmw4x8(p0: int): boolean - public static method contains-fLmw4x8(p0: int[], p1: int): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public static method containsAll-impl(p0: int[], @org.jetbrains.annotations.NotNull p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int[], p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int[], p1: int[]): boolean - public method getSize(): int - public static method getSize-impl(p0: int[]): int - public method hashCode(): int - public static method hashCode-impl(p0: int[]): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: int[]): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.lang.Void - public synthetic bridge method iterator(): java.util.Iterator - public static @org.jetbrains.annotations.NotNull method iterator-impl(p0: int[]): java.lang.Void - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method removeIf(p0: java.util.function.Predicate): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: int[]): java.lang.String - public synthetic final method unbox-impl(): int[] -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.txt index 61073eaa7e0..0c1b909eada 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.txt @@ -21,9 +21,9 @@ public final class UInt { @kotlin.Metadata public final class UIntArray { // source: 'UIntArrayWithFullJdk.kt' - private final field storage: int[] + private final @org.jetbrains.annotations.NotNull field storage: int[] private synthetic method (p0: int[]): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add-fLmw4x8(p0: int): boolean public method addAll(p0: java.util.Collection): boolean public synthetic final static method box-impl(p0: int[]): UIntArray @@ -50,7 +50,7 @@ public final class UIntArray { public method removeAll(p0: java.util.Collection): boolean public method removeIf(p0: java.util.function.Predicate): boolean public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.ir.txt deleted file mode 100644 index b17b38931b5..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.ir.txt +++ /dev/null @@ -1,34 +0,0 @@ -public final class InlineCollection { - // source: 'collection.kt' - private final field c: java.util.Collection - private synthetic method (p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Collection): InlineCollection - public method clear(): void - public static method constructor-impl(p0: java.util.Collection): java.util.Collection - public method contains(p0: java.lang.Object): boolean - public static method contains-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Collection, p1: java.util.Collection): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Collection): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Collection): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Collection): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Collection): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Collection): java.lang.String - public synthetic final method unbox-impl(): java.util.Collection -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.txt index 3e17a66fd24..b17b38931b5 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/collection.txt @@ -25,7 +25,7 @@ public final class InlineCollection { public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.ir.txt deleted file mode 100644 index bb8b5e5b164..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.ir.txt +++ /dev/null @@ -1,50 +0,0 @@ -public final class InlineList { - // source: 'list.kt' - private final field list: java.util.List - private synthetic method (p0: java.util.List): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.List): InlineList - public method clear(): void - public static method constructor-impl(p0: java.util.List): java.util.List - public method contains(p0: java.lang.Object): boolean - public static method contains-impl(p0: java.util.List, p1: java.lang.Object): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean - public method get(p0: int): java.lang.Object - public static method get-impl(p0: java.util.List, p1: int): java.lang.Object - public method getSize(): int - public static method getSize-impl(p0: java.util.List): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.List): int - public method indexOf(p0: java.lang.Object): int - public static method indexOf-impl(p0: java.util.List, p1: java.lang.Object): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.List): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.List): java.util.Iterator - public method lastIndexOf(p0: java.lang.Object): int - public static method lastIndexOf-impl(p0: java.util.List, p1: java.lang.Object): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List, p1: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public synthetic bridge method size(): int - public method subList(p0: int, p1: int): java.util.List - public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.List): java.lang.String - public synthetic final method unbox-impl(): java.util.List -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.txt index bc1df061a4b..bb8b5e5b164 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/list.txt @@ -39,7 +39,7 @@ public final class InlineList { public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int + public synthetic bridge method size(): int public method subList(p0: int, p1: int): java.util.List public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.ir.txt deleted file mode 100644 index c4037e9a831..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.ir.txt +++ /dev/null @@ -1,40 +0,0 @@ -public final class InlineMap { - // source: 'map.kt' - private final field map: java.util.Map - private synthetic method (p0: java.util.Map): void - public synthetic final static method box-impl(p0: java.util.Map): InlineMap - public method clear(): void - public static method constructor-impl(p0: java.util.Map): java.util.Map - public method containsKey(p0: java.lang.Object): boolean - public static method containsKey-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public static method containsValue-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public synthetic bridge method entrySet(): java.util.Set - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean - public method get(p0: java.lang.Object): java.lang.Object - public static method get-impl(p0: java.util.Map, p1: java.lang.Object): java.lang.Object - public method getEntries(): java.util.Set - public static method getEntries-impl(p0: java.util.Map): java.util.Set - public method getKeys(): java.util.Set - public static method getKeys-impl(p0: java.util.Map): java.util.Set - public method getSize(): int - public static method getSize-impl(p0: java.util.Map): int - public method getValues(): java.util.Collection - public static method getValues-impl(p0: java.util.Map): java.util.Collection - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Map): boolean - public synthetic bridge method keySet(): java.util.Set - public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object - public synthetic bridge method size(): int - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map): java.lang.String - public synthetic final method unbox-impl(): java.util.Map - public synthetic bridge method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.txt index 2055d7ff402..c4037e9a831 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/map.txt @@ -9,7 +9,7 @@ public final class InlineMap { public static method containsKey-impl(p0: java.util.Map, p1: java.lang.Object): boolean public method containsValue(p0: java.lang.Object): boolean public static method containsValue-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set + public synthetic bridge method entrySet(): java.util.Set public method equals(p0: java.lang.Object): boolean public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean @@ -27,13 +27,14 @@ public final class InlineMap { public static method hashCode-impl(p0: java.util.Map): int public method isEmpty(): boolean public static method isEmpty-impl(p0: java.util.Map): boolean - public bridge final method keySet(): java.util.Set + public synthetic bridge method keySet(): java.util.Set public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method putAll(p0: java.util.Map): void public method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int + public synthetic bridge method size(): int public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map): java.lang.String public synthetic final method unbox-impl(): java.util.Map - public bridge final method values(): java.util.Collection + public synthetic bridge method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.ir.txt deleted file mode 100644 index 275f677ffa4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -public final class InlineMapEntry { - // source: 'mapEntry.kt' - private final field e: java.util.Map$Entry - private synthetic method (p0: java.util.Map$Entry): void - public synthetic final static method box-impl(p0: java.util.Map$Entry): InlineMapEntry - public static method constructor-impl(p0: java.util.Map$Entry): java.util.Map$Entry - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map$Entry, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map$Entry, p1: java.util.Map$Entry): boolean - public method getKey(): java.lang.Object - public static method getKey-impl(p0: java.util.Map$Entry): java.lang.Object - public method getValue(): java.lang.Object - public static method getValue-impl(p0: java.util.Map$Entry): java.lang.Object - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map$Entry): int - public method setValue(p0: java.lang.Object): java.lang.Object - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map$Entry): java.lang.String - public synthetic final method unbox-impl(): java.util.Map$Entry - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.txt index cb0542591f2..275f677ffa4 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mapEntry.txt @@ -17,4 +17,5 @@ public final class InlineMapEntry { public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map$Entry): java.lang.String public synthetic final method unbox-impl(): java.util.Map$Entry + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.ir.txt deleted file mode 100644 index 6a166009439..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.ir.txt +++ /dev/null @@ -1,40 +0,0 @@ -public final class InlineMutableCollection { - // source: 'mutableCollection.kt' - private final field mc: java.util.Collection - private synthetic method (p0: java.util.Collection): void - public method add(p0: java.lang.Object): boolean - public static method add-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Collection): InlineMutableCollection - public method clear(): void - public static method clear-impl(p0: java.util.Collection): void - public static method constructor-impl(p0: java.util.Collection): java.util.Collection - public method contains(p0: java.lang.Object): boolean - public static method contains-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Collection, p1: java.util.Collection): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Collection): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Collection): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Collection): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Collection): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public static method remove-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Collection): java.lang.String - public synthetic final method unbox-impl(): java.util.Collection -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.txt index 99001464e90..6a166009439 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableCollection.txt @@ -5,7 +5,7 @@ public final class InlineMutableCollection { public method add(p0: java.lang.Object): boolean public static method add-impl(p0: java.util.Collection, p1: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: InlineMutableCollection, p1: java.util.Collection): boolean + public static method addAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean public synthetic final static method box-impl(p0: java.util.Collection): InlineMutableCollection public method clear(): void public static method clear-impl(p0: java.util.Collection): void @@ -31,7 +31,7 @@ public final class InlineMutableCollection { public static method removeAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public static method retainAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.ir.txt deleted file mode 100644 index 666641eddb4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.ir.txt +++ /dev/null @@ -1,61 +0,0 @@ -public final class InlineMutableList { - // source: 'mutableList.kt' - private final field mlist: java.util.List - private synthetic method (p0: java.util.List): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public static method add-impl(p0: java.util.List, p1: int, p2: java.lang.Object): void - public static method add-impl(p0: java.util.List, p1: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.List, p1: int, p2: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.List): InlineMutableList - public method clear(): void - public static method clear-impl(p0: java.util.List): void - public static method constructor-impl(p0: java.util.List): java.util.List - public method contains(p0: java.lang.Object): boolean - public static method contains-impl(p0: java.util.List, p1: java.lang.Object): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean - public method get(p0: int): java.lang.Object - public static method get-impl(p0: java.util.List, p1: int): java.lang.Object - public method getSize(): int - public static method getSize-impl(p0: java.util.List): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.List): int - public method indexOf(p0: java.lang.Object): int - public static method indexOf-impl(p0: java.util.List, p1: java.lang.Object): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.List): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.List): java.util.Iterator - public method lastIndexOf(p0: java.lang.Object): int - public static method lastIndexOf-impl(p0: java.util.List, p1: java.lang.Object): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List, p1: int): java.util.ListIterator - public bridge final method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public static method remove-impl(p0: java.util.List, p1: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method removeAt(p0: int): java.lang.Object - public static method removeAt-impl(p0: java.util.List, p1: int): java.lang.Object - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public static method set-impl(p0: java.util.List, p1: int, p2: java.lang.Object): java.lang.Object - public synthetic bridge method size(): int - public method subList(p0: int, p1: int): java.util.List - public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.List): java.lang.String - public synthetic final method unbox-impl(): java.util.List -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.txt index 5d809e3b793..666641eddb4 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableList.txt @@ -8,8 +8,8 @@ public final class InlineMutableList { public static method add-impl(p0: java.util.List, p1: java.lang.Object): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: InlineMutableList, p1: int, p2: java.util.Collection): boolean - public static method addAll-impl(p0: InlineMutableList, p1: java.util.Collection): boolean + public static method addAll-impl(p0: java.util.List, p1: int, p2: java.util.Collection): boolean + public static method addAll-impl(p0: java.util.List, p1: java.util.Collection): boolean public synthetic final static method box-impl(p0: java.util.List): InlineMutableList public method clear(): void public static method clear-impl(p0: java.util.List): void @@ -50,7 +50,7 @@ public final class InlineMutableList { public static method retainAll-impl(p0: java.util.List, p1: java.util.Collection): boolean public method set(p0: int, p1: java.lang.Object): java.lang.Object public static method set-impl(p0: java.util.List, p1: int, p2: java.lang.Object): java.lang.Object - public bridge final method size(): int + public synthetic bridge method size(): int public method subList(p0: int, p1: int): java.util.List public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.ir.txt deleted file mode 100644 index 798a512c951..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.ir.txt +++ /dev/null @@ -1,44 +0,0 @@ -public final class InlineMutableMap { - // source: 'mutableMap.kt' - private final field mmap: java.util.Map - private synthetic method (p0: java.util.Map): void - public synthetic final static method box-impl(p0: java.util.Map): InlineMutableMap - public method clear(): void - public static method clear-impl(p0: java.util.Map): void - public static method constructor-impl(p0: java.util.Map): java.util.Map - public method containsKey(p0: java.lang.Object): boolean - public static method containsKey-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public static method containsValue-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public synthetic bridge method entrySet(): java.util.Set - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean - public method get(p0: java.lang.Object): java.lang.Object - public static method get-impl(p0: java.util.Map, p1: java.lang.Object): java.lang.Object - public method getEntries(): java.util.Set - public static method getEntries-impl(p0: java.util.Map): java.util.Set - public method getKeys(): java.util.Set - public static method getKeys-impl(p0: java.util.Map): java.util.Set - public method getSize(): int - public static method getSize-impl(p0: java.util.Map): int - public method getValues(): java.util.Collection - public static method getValues-impl(p0: java.util.Map): java.util.Collection - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Map): boolean - public synthetic bridge method keySet(): java.util.Set - public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public static method put-impl(p0: java.util.Map, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object - public static method remove-impl(p0: java.util.Map, p1: java.lang.Object): java.lang.Object - public synthetic bridge method size(): int - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map): java.lang.String - public synthetic final method unbox-impl(): java.util.Map - public synthetic bridge method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.txt index 38415287c82..798a512c951 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMap.txt @@ -10,7 +10,7 @@ public final class InlineMutableMap { public static method containsKey-impl(p0: java.util.Map, p1: java.lang.Object): boolean public method containsValue(p0: java.lang.Object): boolean public static method containsValue-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set + public synthetic bridge method entrySet(): java.util.Set public method equals(p0: java.lang.Object): boolean public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean @@ -28,16 +28,17 @@ public final class InlineMutableMap { public static method hashCode-impl(p0: java.util.Map): int public method isEmpty(): boolean public static method isEmpty-impl(p0: java.util.Map): boolean - public bridge final method keySet(): java.util.Set + public synthetic bridge method keySet(): java.util.Set public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public static method put-impl(p0: java.util.Map, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public method putAll(p0: java.util.Map): void - public static method putAll-impl(p0: InlineMutableMap, p1: java.util.Map): void + public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void public method remove(p0: java.lang.Object): java.lang.Object public static method remove-impl(p0: java.util.Map, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int + public synthetic bridge method size(): int public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map): java.lang.String public synthetic final method unbox-impl(): java.util.Map - public bridge final method values(): java.util.Collection + public synthetic bridge method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.ir.txt deleted file mode 100644 index 2a91e3a99aa..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -public final class InlineMutableMapEntry { - // source: 'mutableMapEntry.kt' - private final field e: java.util.Map$Entry - private synthetic method (p0: java.util.Map$Entry): void - public synthetic final static method box-impl(p0: java.util.Map$Entry): InlineMutableMapEntry - public static method constructor-impl(p0: java.util.Map$Entry): java.util.Map$Entry - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map$Entry, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map$Entry, p1: java.util.Map$Entry): boolean - public method getKey(): java.lang.Object - public static method getKey-impl(p0: java.util.Map$Entry): java.lang.Object - public method getValue(): java.lang.Object - public static method getValue-impl(p0: java.util.Map$Entry): java.lang.Object - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map$Entry): int - public method setValue(p0: java.lang.Object): java.lang.Object - public static method setValue-impl(p0: java.util.Map$Entry, p1: java.lang.Object): java.lang.Object - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map$Entry): java.lang.String - public synthetic final method unbox-impl(): java.util.Map$Entry - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.txt index 644c849d186..2a91e3a99aa 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableMapEntry.txt @@ -18,4 +18,5 @@ public final class InlineMutableMapEntry { public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map$Entry): java.lang.String public synthetic final method unbox-impl(): java.util.Map$Entry + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.ir.txt deleted file mode 100644 index c01affe3426..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.ir.txt +++ /dev/null @@ -1,40 +0,0 @@ -public final class InlineMutableSet { - // source: 'mutableSet.kt' - private final field ms: java.util.Set - private synthetic method (p0: java.util.Set): void - public method add(p0: java.lang.Object): boolean - public static method add-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Set): InlineMutableSet - public method clear(): void - public static method clear-impl(p0: java.util.Set): void - public static method constructor-impl(p0: java.util.Set): java.util.Set - public method contains(p0: java.lang.Object): boolean - public static method contains-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Set, p1: java.util.Set): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Set): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Set): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Set): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Set): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public static method remove-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Set): java.lang.String - public synthetic final method unbox-impl(): java.util.Set -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.txt index 3ae42dc181f..c01affe3426 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/mutableSet.txt @@ -5,7 +5,7 @@ public final class InlineMutableSet { public method add(p0: java.lang.Object): boolean public static method add-impl(p0: java.util.Set, p1: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: InlineMutableSet, p1: java.util.Collection): boolean + public static method addAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean public synthetic final static method box-impl(p0: java.util.Set): InlineMutableSet public method clear(): void public static method clear-impl(p0: java.util.Set): void @@ -31,7 +31,7 @@ public final class InlineMutableSet { public static method removeAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public static method retainAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.ir.txt deleted file mode 100644 index f9c473f8b08..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.ir.txt +++ /dev/null @@ -1,34 +0,0 @@ -public final class InlineSet { - // source: 'set.kt' - private final field s: java.util.Set - private synthetic method (p0: java.util.Set): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Set): InlineSet - public method clear(): void - public static method constructor-impl(p0: java.util.Set): java.util.Set - public method contains(p0: java.lang.Object): boolean - public static method contains-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Set, p1: java.util.Set): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Set): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Set): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Set): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Set): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Set): java.lang.String - public synthetic final method unbox-impl(): java.util.Set -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.txt index 1dbd80462a8..f9c473f8b08 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/set.txt @@ -25,7 +25,7 @@ public final class InlineSet { public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.ir.txt deleted file mode 100644 index c10951b8475..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.ir.txt +++ /dev/null @@ -1,53 +0,0 @@ -public final class IT { - // source: 'collection.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class InlineCollection { - // source: 'collection.kt' - private final field c: java.util.Collection - private synthetic method (p0: java.util.Collection): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-jHY5zpA(p0: int): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Collection): InlineCollection - public method clear(): void - public static method constructor-impl(p0: java.util.Collection): java.util.Collection - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-jHY5zpA(p0: int): boolean - public static method contains-jHY5zpA(p0: java.util.Collection, p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Collection, p1: java.util.Collection): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Collection): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Collection): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Collection): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Collection): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Collection): java.lang.String - public synthetic final method unbox-impl(): java.util.Collection -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.txt index fbfb88e8c87..c10951b8475 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/collection.txt @@ -19,7 +19,7 @@ public final class InlineCollection { // source: 'collection.kt' private final field c: java.util.Collection private synthetic method (p0: java.util.Collection): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add-jHY5zpA(p0: int): boolean public method addAll(p0: java.util.Collection): boolean public synthetic final static method box-impl(p0: java.util.Collection): InlineCollection @@ -44,7 +44,7 @@ public final class InlineCollection { public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.ir.txt deleted file mode 100644 index e8f71deff56..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.ir.txt +++ /dev/null @@ -1,75 +0,0 @@ -public final class IT { - // source: 'list.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class InlineList { - // source: 'list.kt' - private final field list: java.util.List - private synthetic method (p0: java.util.List): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add--AyYFnU(p0: int, p1: int): void - public method add-jHY5zpA(p0: int): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.List): InlineList - public method clear(): void - public static method constructor-impl(p0: java.util.List): java.util.List - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-jHY5zpA(p0: int): boolean - public static method contains-jHY5zpA(p0: java.util.List, p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean - public synthetic bridge method get(p0: int): java.lang.Object - public method get-7aQB58E(p0: int): int - public static method get-7aQB58E(p0: java.util.List, p1: int): int - public method getSize(): int - public static method getSize-impl(p0: java.util.List): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.List): int - public bridge final method indexOf(p0: java.lang.Object): int - public method indexOf-jHY5zpA(p0: int): int - public static method indexOf-jHY5zpA(p0: java.util.List, p1: int): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.List): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.List): java.util.Iterator - public bridge final method lastIndexOf(p0: java.lang.Object): int - public method lastIndexOf-jHY5zpA(p0: int): int - public static method lastIndexOf-jHY5zpA(p0: java.util.List, p1: int): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List, p1: int): java.util.ListIterator - public method remove(p0: int): int - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set-kAA0daY(p0: int, p1: int): int - public synthetic bridge method size(): int - public method subList(p0: int, p1: int): java.util.List - public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.List): java.lang.String - public synthetic final method unbox-impl(): java.util.List -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt index f0e8e34727a..e8f71deff56 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/list.txt @@ -19,8 +19,8 @@ public final class InlineList { // source: 'list.kt' private final field list: java.util.List private synthetic method (p0: java.util.List): void - public synthetic method add(p0: int, p1: java.lang.Object): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): boolean public method add--AyYFnU(p0: int, p1: int): void public method add-jHY5zpA(p0: int): boolean public method addAll(p0: int, p1: java.util.Collection): boolean @@ -58,13 +58,13 @@ public final class InlineList { public static method listIterator-impl(p0: java.util.List): java.util.ListIterator public static method listIterator-impl(p0: java.util.List, p1: int): java.util.ListIterator public method remove(p0: int): int - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set-kAA0daY(p0: int, p1: int): int - public bridge final method size(): int + public synthetic bridge method size(): int public method subList(p0: int, p1: int): java.util.List public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.ir.txt deleted file mode 100644 index f4d7746aacf..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.ir.txt +++ /dev/null @@ -1,81 +0,0 @@ -public final class IK { - // source: 'map.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IK - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class IV { - // source: 'map.kt' - private final field x: double - private synthetic method (p0: double): void - public synthetic final static method box-impl(p0: double): IV - public static method constructor-impl(p0: double): double - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: double, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: double, p1: double): boolean - public final method getX(): double - public method hashCode(): int - public static method hashCode-impl(p0: double): int - public method toString(): java.lang.String - public static method toString-impl(p0: double): java.lang.String - public synthetic final method unbox-impl(): double -} - -public final class InlineMap { - // source: 'map.kt' - private final field map: java.util.Map - private synthetic method (p0: java.util.Map): void - public synthetic final static method box-impl(p0: java.util.Map): InlineMap - public method clear(): void - public static method constructor-impl(p0: java.util.Map): java.util.Map - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsKey-FSIWiWE(p0: int): boolean - public static method containsKey-FSIWiWE(p0: java.util.Map, p1: int): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public method containsValue-jbX5DO8(p0: double): boolean - public static method containsValue-jbX5DO8(p0: java.util.Map, p1: double): boolean - public synthetic bridge method entrySet(): java.util.Set - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean - public bridge final method get(p0: java.lang.Object): IV - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public method get-qgyy0Jc(p0: int): IV - public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV - public method getEntries(): java.util.Set - public static method getEntries-impl(p0: java.util.Map): java.util.Set - public method getKeys(): java.util.Set - public static method getKeys-impl(p0: java.util.Map): java.util.Set - public method getSize(): int - public static method getSize-impl(p0: java.util.Map): int - public method getValues(): java.util.Collection - public static method getValues-impl(p0: java.util.Map): java.util.Collection - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Map): boolean - public synthetic bridge method keySet(): java.util.Set - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method put-t80dRTo(p0: int, p1: double): IV - public method putAll(p0: java.util.Map): void - public bridge final method remove(p0: java.lang.Object): IV - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public method remove-TbaaF6U(p0: java.lang.Object): IV - public synthetic bridge method size(): int - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map): java.lang.String - public synthetic final method unbox-impl(): java.util.Map - public synthetic bridge method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt index 24de24be2d7..f4d7746aacf 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/map.txt @@ -45,11 +45,12 @@ public final class InlineMap { public bridge final method containsValue(p0: java.lang.Object): boolean public method containsValue-jbX5DO8(p0: double): boolean public static method containsValue-jbX5DO8(p0: java.util.Map, p1: double): boolean - public bridge final method entrySet(): java.util.Set + public synthetic bridge method entrySet(): java.util.Set public method equals(p0: java.lang.Object): boolean public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): IV + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public method get-qgyy0Jc(p0: int): IV public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV public method getEntries(): java.util.Set @@ -64,14 +65,17 @@ public final class InlineMap { public static method hashCode-impl(p0: java.util.Map): int public method isEmpty(): boolean public static method isEmpty-impl(p0: java.util.Map): boolean - public bridge final method keySet(): java.util.Set - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method keySet(): java.util.Set + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method put-t80dRTo(p0: int, p1: double): IV public method putAll(p0: java.util.Map): void - public method remove(p0: java.lang.Object): java.lang.Object - public bridge final method size(): int + public bridge final method remove(p0: java.lang.Object): IV + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public method remove-TbaaF6U(p0: java.lang.Object): IV + public synthetic bridge method size(): int public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map): java.lang.String public synthetic final method unbox-impl(): java.util.Map - public bridge final method values(): java.util.Collection + public synthetic bridge method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.ir.txt deleted file mode 100644 index eb0a5342748..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.ir.txt +++ /dev/null @@ -1,58 +0,0 @@ -public final class IK { - // source: 'mapEntry.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IK - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class IV { - // source: 'mapEntry.kt' - private final field x: double - private synthetic method (p0: double): void - public synthetic final static method box-impl(p0: double): IV - public static method constructor-impl(p0: double): double - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: double, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: double, p1: double): boolean - public final method getX(): double - public method hashCode(): int - public static method hashCode-impl(p0: double): int - public method toString(): java.lang.String - public static method toString-impl(p0: double): java.lang.String - public synthetic final method unbox-impl(): double -} - -public final class InlineMapEntry { - // source: 'mapEntry.kt' - private final field e: java.util.Map$Entry - private synthetic method (p0: java.util.Map$Entry): void - public synthetic final static method box-impl(p0: java.util.Map$Entry): InlineMapEntry - public static method constructor-impl(p0: java.util.Map$Entry): java.util.Map$Entry - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map$Entry, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map$Entry, p1: java.util.Map$Entry): boolean - public synthetic bridge method getKey(): java.lang.Object - public method getKey-I5j8jlQ(): int - public static method getKey-I5j8jlQ(p0: java.util.Map$Entry): int - public synthetic bridge method getValue(): java.lang.Object - public method getValue-zSeR6Gk(): double - public static method getValue-zSeR6Gk(p0: java.util.Map$Entry): double - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map$Entry): int - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public method setValue-cYiyq8k(p0: double): double - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map$Entry): java.lang.String - public synthetic final method unbox-impl(): java.util.Map$Entry - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt index 45a7fff750d..eb0a5342748 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mapEntry.txt @@ -49,9 +49,10 @@ public final class InlineMapEntry { public static method getValue-zSeR6Gk(p0: java.util.Map$Entry): double public method hashCode(): int public static method hashCode-impl(p0: java.util.Map$Entry): int - public synthetic method setValue(p0: java.lang.Object): java.lang.Object + public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object public method setValue-cYiyq8k(p0: double): double public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map$Entry): java.lang.String public synthetic final method unbox-impl(): java.util.Map$Entry + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.ir.txt deleted file mode 100644 index 575f2f46d03..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.ir.txt +++ /dev/null @@ -1,60 +0,0 @@ -public final class IT { - // source: 'mutableCollection.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class InlineMutableCollection { - // source: 'mutableCollection.kt' - private final field mc: java.util.Collection - private synthetic method (p0: java.util.Collection): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-jHY5zpA(p0: int): boolean - public static method add-jHY5zpA(p0: java.util.Collection, p1: int): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Collection): InlineMutableCollection - public method clear(): void - public static method clear-impl(p0: java.util.Collection): void - public static method constructor-impl(p0: java.util.Collection): java.util.Collection - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-jHY5zpA(p0: int): boolean - public static method contains-jHY5zpA(p0: java.util.Collection, p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Collection, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Collection, p1: java.util.Collection): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Collection): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Collection): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Collection): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Collection): java.util.Iterator - public bridge final method remove(p0: java.lang.Object): boolean - public method remove-jHY5zpA(p0: IT): boolean - public static method remove-jHY5zpA(p0: java.util.Collection, p1: IT): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Collection): java.lang.String - public synthetic final method unbox-impl(): java.util.Collection -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.txt index 019d63972f1..575f2f46d03 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableCollection.txt @@ -51,7 +51,7 @@ public final class InlineMutableCollection { public static method removeAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public static method retainAll-impl(p0: java.util.Collection, p1: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.ir.txt deleted file mode 100644 index 7af209ff5cc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.ir.txt +++ /dev/null @@ -1,87 +0,0 @@ -public final class IT { - // source: 'mutableList.kt' - private final field x: long - private synthetic method (p0: long): void - public synthetic final static method box-impl(p0: long): IT - public static method constructor-impl(p0: long): long - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: long, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: long, p1: long): boolean - public final method getX(): long - public method hashCode(): int - public static method hashCode-impl(p0: long): int - public method toString(): java.lang.String - public static method toString-impl(p0: long): java.lang.String - public synthetic final method unbox-impl(): long -} - -public final class InlineMutableList { - // source: 'mutableList.kt' - private final field mlist: java.util.List - private synthetic method (p0: java.util.List): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add--AyYFnU(p0: int, p1: long): void - public static method add--AyYFnU(p0: java.util.List, p1: int, p2: long): void - public static method add-jHY5zpA(p0: java.util.List, p1: long): boolean - public method add-jHY5zpA(p0: long): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.List, p1: int, p2: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.List): InlineMutableList - public method clear(): void - public static method clear-impl(p0: java.util.List): void - public static method constructor-impl(p0: java.util.List): java.util.List - public bridge final method contains(p0: java.lang.Object): boolean - public static method contains-jHY5zpA(p0: java.util.List, p1: long): boolean - public method contains-jHY5zpA(p0: long): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.List, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.List, p1: java.util.List): boolean - public synthetic bridge method get(p0: int): java.lang.Object - public method get-7aQB58E(p0: int): long - public static method get-7aQB58E(p0: java.util.List, p1: int): long - public method getSize(): int - public static method getSize-impl(p0: java.util.List): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.List): int - public bridge final method indexOf(p0: java.lang.Object): int - public static method indexOf-jHY5zpA(p0: java.util.List, p1: long): int - public method indexOf-jHY5zpA(p0: long): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.List): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.List): java.util.Iterator - public bridge final method lastIndexOf(p0: java.lang.Object): int - public static method lastIndexOf-jHY5zpA(p0: java.util.List, p1: long): int - public method lastIndexOf-jHY5zpA(p0: long): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List): java.util.ListIterator - public static method listIterator-impl(p0: java.util.List, p1: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public bridge final method remove(p0: int): long - public bridge final method remove(p0: java.lang.Object): boolean - public static method remove-jHY5zpA(p0: java.util.List, p1: long): boolean - public method remove-jHY5zpA(p0: long): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public method removeAt-7aQB58E(p0: int): long - public static method removeAt-7aQB58E(p0: java.util.List, p1: int): long - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.List, p1: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set-kAA0daY(p0: int, p1: long): long - public static method set-kAA0daY(p0: java.util.List, p1: int, p2: long): long - public synthetic bridge method size(): int - public method subList(p0: int, p1: int): java.util.List - public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.List): java.lang.String - public synthetic final method unbox-impl(): java.util.List -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt index 4cbc2eb382d..7af209ff5cc 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableList.txt @@ -76,7 +76,7 @@ public final class InlineMutableList { public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set-kAA0daY(p0: int, p1: long): long public static method set-kAA0daY(p0: java.util.List, p1: int, p2: long): long - public bridge final method size(): int + public synthetic bridge method size(): int public method subList(p0: int, p1: int): java.util.List public static method subList-impl(p0: java.util.List, p1: int, p2: int): java.util.List public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.ir.txt deleted file mode 100644 index c8632ffa348..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.ir.txt +++ /dev/null @@ -1,85 +0,0 @@ -public final class IK { - // source: 'mutableMap.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IK - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class IV { - // source: 'mutableMap.kt' - private final field x: double - private synthetic method (p0: double): void - public synthetic final static method box-impl(p0: double): IV - public static method constructor-impl(p0: double): double - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: double, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: double, p1: double): boolean - public final method getX(): double - public method hashCode(): int - public static method hashCode-impl(p0: double): int - public method toString(): java.lang.String - public static method toString-impl(p0: double): java.lang.String - public synthetic final method unbox-impl(): double -} - -public final class InlineMutableMap { - // source: 'mutableMap.kt' - private final field mmap: java.util.Map - private synthetic method (p0: java.util.Map): void - public synthetic final static method box-impl(p0: java.util.Map): InlineMutableMap - public method clear(): void - public static method clear-impl(p0: java.util.Map): void - public static method constructor-impl(p0: java.util.Map): java.util.Map - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsKey-FSIWiWE(p0: int): boolean - public static method containsKey-FSIWiWE(p0: java.util.Map, p1: int): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public method containsValue-jbX5DO8(p0: double): boolean - public static method containsValue-jbX5DO8(p0: java.util.Map, p1: double): boolean - public synthetic bridge method entrySet(): java.util.Set - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean - public bridge final method get(p0: java.lang.Object): IV - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public method get-qgyy0Jc(p0: int): IV - public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV - public method getEntries(): java.util.Set - public static method getEntries-impl(p0: java.util.Map): java.util.Set - public method getKeys(): java.util.Set - public static method getKeys-impl(p0: java.util.Map): java.util.Set - public method getSize(): int - public static method getSize-impl(p0: java.util.Map): int - public method getValues(): java.util.Collection - public static method getValues-impl(p0: java.util.Map): java.util.Collection - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Map): boolean - public synthetic bridge method keySet(): java.util.Set - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method put-t80dRTo(p0: int, p1: double): IV - public static method put-t80dRTo(p0: java.util.Map, p1: int, p2: double): IV - public method putAll(p0: java.util.Map): void - public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void - public bridge final method remove(p0: java.lang.Object): IV - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public method remove-qgyy0Jc(p0: int): IV - public static method remove-qgyy0Jc(p0: java.util.Map, p1: int): IV - public synthetic bridge method size(): int - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map): java.lang.String - public synthetic final method unbox-impl(): java.util.Map - public synthetic bridge method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt index 84f8aa84ae5..c8632ffa348 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMap.txt @@ -46,11 +46,12 @@ public final class InlineMutableMap { public bridge final method containsValue(p0: java.lang.Object): boolean public method containsValue-jbX5DO8(p0: double): boolean public static method containsValue-jbX5DO8(p0: java.util.Map, p1: double): boolean - public bridge final method entrySet(): java.util.Set + public synthetic bridge method entrySet(): java.util.Set public method equals(p0: java.lang.Object): boolean public static method equals-impl(p0: java.util.Map, p1: java.lang.Object): boolean public final static method equals-impl0(p0: java.util.Map, p1: java.util.Map): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): IV + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public method get-qgyy0Jc(p0: int): IV public static method get-qgyy0Jc(p0: java.util.Map, p1: int): IV public method getEntries(): java.util.Set @@ -65,18 +66,20 @@ public final class InlineMutableMap { public static method hashCode-impl(p0: java.util.Map): int public method isEmpty(): boolean public static method isEmpty-impl(p0: java.util.Map): boolean - public bridge final method keySet(): java.util.Set + public synthetic bridge method keySet(): java.util.Set public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public method put-t80dRTo(p0: int, p1: double): IV public static method put-t80dRTo(p0: java.util.Map, p1: int, p2: double): IV public method putAll(p0: java.util.Map): void public static method putAll-impl(p0: java.util.Map, p1: java.util.Map): void - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): IV + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object public method remove-qgyy0Jc(p0: int): IV public static method remove-qgyy0Jc(p0: java.util.Map, p1: int): IV - public bridge final method size(): int + public synthetic bridge method size(): int public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map): java.lang.String public synthetic final method unbox-impl(): java.util.Map - public bridge final method values(): java.util.Collection + public synthetic bridge method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.ir.txt deleted file mode 100644 index 821bdda5156..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.ir.txt +++ /dev/null @@ -1,59 +0,0 @@ -public final class IK { - // source: 'mutableMapEntry.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IK - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class IV { - // source: 'mutableMapEntry.kt' - private final field x: double - private synthetic method (p0: double): void - public synthetic final static method box-impl(p0: double): IV - public static method constructor-impl(p0: double): double - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: double, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: double, p1: double): boolean - public final method getX(): double - public method hashCode(): int - public static method hashCode-impl(p0: double): int - public method toString(): java.lang.String - public static method toString-impl(p0: double): java.lang.String - public synthetic final method unbox-impl(): double -} - -public final class InlineMutableMapEntry { - // source: 'mutableMapEntry.kt' - private final field e: java.util.Map$Entry - private synthetic method (p0: java.util.Map$Entry): void - public synthetic final static method box-impl(p0: java.util.Map$Entry): InlineMutableMapEntry - public static method constructor-impl(p0: java.util.Map$Entry): java.util.Map$Entry - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Map$Entry, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Map$Entry, p1: java.util.Map$Entry): boolean - public synthetic bridge method getKey(): java.lang.Object - public method getKey-I5j8jlQ(): int - public static method getKey-I5j8jlQ(p0: java.util.Map$Entry): int - public synthetic bridge method getValue(): java.lang.Object - public method getValue-zSeR6Gk(): double - public static method getValue-zSeR6Gk(p0: java.util.Map$Entry): double - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Map$Entry): int - public synthetic bridge method setValue(p0: java.lang.Object): java.lang.Object - public method setValue-cYiyq8k(p0: double): double - public static method setValue-cYiyq8k(p0: java.util.Map$Entry, p1: double): double - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Map$Entry): java.lang.String - public synthetic final method unbox-impl(): java.util.Map$Entry - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt index c785efd7c01..821bdda5156 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableMapEntry.txt @@ -55,4 +55,5 @@ public final class InlineMutableMapEntry { public method toString(): java.lang.String public static method toString-impl(p0: java.util.Map$Entry): java.lang.String public synthetic final method unbox-impl(): java.util.Map$Entry + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.ir.txt deleted file mode 100644 index 4fc590cc770..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.ir.txt +++ /dev/null @@ -1,60 +0,0 @@ -public final class IT { - // source: 'mutableSet.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class InlineMutableSet { - // source: 'mutableSet.kt' - private final field ms: java.util.Set - private synthetic method (p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-jHY5zpA(p0: int): boolean - public static method add-jHY5zpA(p0: java.util.Set, p1: int): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Set): InlineMutableSet - public method clear(): void - public static method clear-impl(p0: java.util.Set): void - public static method constructor-impl(p0: java.util.Set): java.util.Set - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-jHY5zpA(p0: int): boolean - public static method contains-jHY5zpA(p0: java.util.Set, p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Set, p1: java.util.Set): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Set): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Set): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Set): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Set): java.util.Iterator - public bridge final method remove(p0: java.lang.Object): boolean - public method remove-jHY5zpA(p0: IT): boolean - public static method remove-jHY5zpA(p0: java.util.Set, p1: IT): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Set): java.lang.String - public synthetic final method unbox-impl(): java.util.Set -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.txt index 645d3c404aa..4fc590cc770 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet.txt @@ -51,7 +51,7 @@ public final class InlineMutableSet { public static method removeAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public static method retainAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.ir.txt deleted file mode 100644 index c68d863467e..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.ir.txt +++ /dev/null @@ -1,77 +0,0 @@ -public final class IT { - // source: 'mutableSet2.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class IT2 { - // source: 'mutableSet2.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT2 - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX-XAcLw3A(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class InlineMutableSet2 { - // source: 'mutableSet2.kt' - private final field ms: java.util.Set - private synthetic method (p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-C2ZI6mw(p0: int): boolean - public static method add-C2ZI6mw(p0: java.util.Set, p1: int): boolean - public method addAll(p0: java.util.Collection): boolean - public static method addAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Set): InlineMutableSet2 - public method clear(): void - public static method clear-impl(p0: java.util.Set): void - public static method constructor-impl(p0: java.util.Set): java.util.Set - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-C2ZI6mw(p0: int): boolean - public static method contains-C2ZI6mw(p0: java.util.Set, p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Set, p1: java.util.Set): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Set): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Set): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Set): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Set): java.util.Iterator - public bridge final method remove(p0: java.lang.Object): boolean - public method remove-C2ZI6mw(p0: IT2): boolean - public static method remove-C2ZI6mw(p0: java.util.Set, p1: IT2): boolean - public method removeAll(p0: java.util.Collection): boolean - public static method removeAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public static method retainAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Set): java.lang.String - public synthetic final method unbox-impl(): java.util.Set -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.txt index 098c3b21857..c68d863467e 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/mutableSet2.txt @@ -68,7 +68,7 @@ public final class InlineMutableSet2 { public static method removeAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public static method retainAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.ir.txt deleted file mode 100644 index 377d4e338dc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.ir.txt +++ /dev/null @@ -1,53 +0,0 @@ -public final class IT { - // source: 'set.kt' - private final field x: int - private synthetic method (p0: int): void - public synthetic final static method box-impl(p0: int): IT - public static method constructor-impl(p0: int): int - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int, p1: int): boolean - public final method getX(): int - public method hashCode(): int - public static method hashCode-impl(p0: int): int - public method toString(): java.lang.String - public static method toString-impl(p0: int): java.lang.String - public synthetic final method unbox-impl(): int -} - -public final class InlineSet { - // source: 'set.kt' - private final field s: java.util.Set - private synthetic method (p0: java.util.Set): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-jHY5zpA(p0: int): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: java.util.Set): InlineSet - public method clear(): void - public static method constructor-impl(p0: java.util.Set): java.util.Set - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-jHY5zpA(p0: int): boolean - public static method contains-jHY5zpA(p0: java.util.Set, p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: java.util.Set, p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: java.util.Set, p1: java.lang.Object): boolean - public final static method equals-impl0(p0: java.util.Set, p1: java.util.Set): boolean - public method getSize(): int - public static method getSize-impl(p0: java.util.Set): int - public method hashCode(): int - public static method hashCode-impl(p0: java.util.Set): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: java.util.Set): boolean - public method iterator(): java.util.Iterator - public static method iterator-impl(p0: java.util.Set): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: java.util.Set): java.lang.String - public synthetic final method unbox-impl(): java.util.Set -} diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.txt index 0bdaddc32bb..377d4e338dc 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollectionOfInlineClass/set.txt @@ -19,7 +19,7 @@ public final class InlineSet { // source: 'set.kt' private final field s: java.util.Set private synthetic method (p0: java.util.Set): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add-jHY5zpA(p0: int): boolean public method addAll(p0: java.util.Collection): boolean public synthetic final static method box-impl(p0: java.util.Set): InlineSet @@ -44,7 +44,7 @@ public final class InlineSet { public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt deleted file mode 100644 index a0b8ed00c5b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt +++ /dev/null @@ -1,6 +0,0 @@ -@kotlin.Metadata -public interface I { - // source: 'privateAccessorNaming.kt' - public method bar(): int - private method foo(): int -} diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt index d79f2713dac..a0b8ed00c5b 100644 --- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt +++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt @@ -1,19 +1,6 @@ -@kotlin.Metadata -final class I$bar$1 { - // source: 'privateAccessorNaming.kt' - enclosing method I.bar()I - synthetic final field this$0: I - inner (anonymous) class I$bar$1 - method (p0: I): void - public final method invoke(): int - public synthetic bridge method invoke(): java.lang.Object -} - @kotlin.Metadata public interface I { // source: 'privateAccessorNaming.kt' - inner (anonymous) class I$bar$1 - public synthetic static method access$foo(p0: I): int public method bar(): int private method foo(): int } diff --git a/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.ir.txt b/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.ir.txt deleted file mode 100644 index 2a468040f00..00000000000 --- a/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.ir.txt +++ /dev/null @@ -1,40 +0,0 @@ -@kotlin.Metadata -public final class A$Companion { - // source: 'jvmStaticPrivate.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public synthetic final static method access$f(p0: A$Companion, p1: int): void - public synthetic final static method access$getXx(p0: A$Companion): java.lang.String - public synthetic final static method access$setXx(p0: A$Companion, p1: java.lang.String): void - private final @kotlin.jvm.JvmStatic method f(p0: int): void - private synthetic deprecated static @kotlin.jvm.JvmStatic method getX$annotations(): void - private final @kotlin.jvm.JvmStatic method getXx(): java.lang.String - private final @kotlin.jvm.JvmStatic method setXx(p0: java.lang.String): void - public final inner class A$Companion -} - -@kotlin.Metadata -public final class A { - // source: 'jvmStaticPrivate.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: A$Companion - private final static @org.jetbrains.annotations.NotNull field x: java.lang.String - static method (): void - public method (): void - private final static @kotlin.jvm.JvmStatic method f(p0: int): void - private final static @kotlin.jvm.JvmStatic method getXx(): java.lang.String - private final static @kotlin.jvm.JvmStatic method setXx(p0: java.lang.String): void - public final inner class A$Companion -} - -@kotlin.Metadata -public final class O { - // source: 'jvmStaticPrivate.kt' - public final static @org.jetbrains.annotations.NotNull field INSTANCE: O - private final static @org.jetbrains.annotations.NotNull field y: java.lang.String - static method (): void - private method (): void - private final static @kotlin.jvm.JvmStatic method g(p0: int): void - private synthetic deprecated static @kotlin.jvm.JvmStatic method getY$annotations(): void - private final static @kotlin.jvm.JvmStatic method getYy(): java.lang.String - private final static @kotlin.jvm.JvmStatic method setYy(p0: java.lang.String): void -} diff --git a/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.txt b/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.txt index 13c3b7af119..2a468040f00 100644 --- a/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.txt +++ b/compiler/testData/codegen/bytecodeListing/jvmStatic/jvmStaticPrivate.txt @@ -4,8 +4,8 @@ public final class A$Companion { private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public synthetic final static method access$f(p0: A$Companion, p1: int): void - public synthetic final static method access$getXx$p(p0: A$Companion): java.lang.String - public synthetic final static method access$setXx$p(p0: A$Companion, p1: java.lang.String): void + public synthetic final static method access$getXx(p0: A$Companion): java.lang.String + public synthetic final static method access$setXx(p0: A$Companion, p1: java.lang.String): void private final @kotlin.jvm.JvmStatic method f(p0: int): void private synthetic deprecated static @kotlin.jvm.JvmStatic method getX$annotations(): void private final @kotlin.jvm.JvmStatic method getXx(): java.lang.String @@ -17,7 +17,7 @@ public final class A$Companion { public final class A { // source: 'jvmStaticPrivate.kt' public final static @org.jetbrains.annotations.NotNull field Companion: A$Companion - private final static field x: java.lang.String + private final static @org.jetbrains.annotations.NotNull field x: java.lang.String static method (): void public method (): void private final static @kotlin.jvm.JvmStatic method f(p0: int): void @@ -30,7 +30,7 @@ public final class A { public final class O { // source: 'jvmStaticPrivate.kt' public final static @org.jetbrains.annotations.NotNull field INSTANCE: O - private final static field y: java.lang.String + private final static @org.jetbrains.annotations.NotNull field y: java.lang.String static method (): void private method (): void private final static @kotlin.jvm.JvmStatic method g(p0: int): void diff --git a/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.ir.txt b/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.ir.txt deleted file mode 100644 index 1daeeebfed5..00000000000 --- a/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -@kotlin.Metadata -public final class Annotation$Companion { - // source: 'kt31389.kt' - synthetic final static field $$INSTANCE: Annotation$Companion - private static @org.jetbrains.annotations.NotNull field TEST_FIELD2: java.lang.String - private final static @org.jetbrains.annotations.NotNull field TEST_FIELD: java.lang.String - static method (): void - private method (): void - public synthetic deprecated static @kotlin.jvm.JvmStatic method getTEST_FIELD$annotations(): void - public final @org.jetbrains.annotations.NotNull method getTEST_FIELD(): java.lang.String - public final @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method getTEST_FIELD2(): java.lang.String - public final @kotlin.jvm.JvmStatic method setTEST_FIELD2(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final inner class Annotation$Companion -} - -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class Annotation { - // source: 'kt31389.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: Annotation$Companion - static method (): void - public static @org.jetbrains.annotations.NotNull method getTEST_FIELD(): java.lang.String - public static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method getTEST_FIELD2(): java.lang.String - public static @kotlin.jvm.JvmStatic method setTEST_FIELD2(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final inner class Annotation$Companion -} diff --git a/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.txt b/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.txt index 64d580cf632..1daeeebfed5 100644 --- a/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.txt +++ b/compiler/testData/codegen/bytecodeListing/jvmStatic/kt31389.txt @@ -19,8 +19,8 @@ public annotation class Annotation { // source: 'kt31389.kt' public final static @org.jetbrains.annotations.NotNull field Companion: Annotation$Companion static method (): void - public static method getTEST_FIELD(): java.lang.String - public static @kotlin.jvm.JvmStatic method getTEST_FIELD2(): java.lang.String + public static @org.jetbrains.annotations.NotNull method getTEST_FIELD(): java.lang.String + public static @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull method getTEST_FIELD2(): java.lang.String public static @kotlin.jvm.JvmStatic method setTEST_FIELD2(@org.jetbrains.annotations.NotNull p0: java.lang.String): void public final inner class Annotation$Companion } diff --git a/compiler/testData/codegen/bytecodeListing/kt42879.kt b/compiler/testData/codegen/bytecodeListing/kt42879.kt index 3333abea0f8..07d6e5f0893 100644 --- a/compiler/testData/codegen/bytecodeListing/kt42879.kt +++ b/compiler/testData/codegen/bytecodeListing/kt42879.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM inline class A(val value: Int) fun interface I { diff --git a/compiler/testData/codegen/bytecodeListing/kt43217.ir.txt b/compiler/testData/codegen/bytecodeListing/kt43217.ir.txt deleted file mode 100644 index e7cad75eb9b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/kt43217.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -@kotlin.Metadata -public final class A$b$1 { - // source: 'kt43217.kt' - enclosing method A.()V - inner (anonymous) class A$b$1 - method (): void - public method get(): java.lang.Double - public synthetic bridge method get(): java.lang.Object -} - -@kotlin.Metadata -public final class A { - // source: 'kt43217.kt' - private final @org.jetbrains.annotations.NotNull field b: A$b$1 - inner (anonymous) class A$b$1 - public method (): void -} - -@kotlin.Metadata -public final class C { - // source: 'kt43217.kt' - public method (): void - public @org.jetbrains.annotations.NotNull method get(): java.lang.Double - public synthetic bridge method get(): java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/kt43217.txt b/compiler/testData/codegen/bytecodeListing/kt43217.txt index 5f3451d1fac..e7cad75eb9b 100644 --- a/compiler/testData/codegen/bytecodeListing/kt43217.txt +++ b/compiler/testData/codegen/bytecodeListing/kt43217.txt @@ -4,14 +4,14 @@ public final class A$b$1 { enclosing method A.()V inner (anonymous) class A$b$1 method (): void - public @org.jetbrains.annotations.NotNull method get(): java.lang.Double + public method get(): java.lang.Double public synthetic bridge method get(): java.lang.Object } @kotlin.Metadata public final class A { // source: 'kt43217.kt' - private final field b: A$b$1 + private final @org.jetbrains.annotations.NotNull field b: A$b$1 inner (anonymous) class A$b$1 public method (): void } diff --git a/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt b/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt deleted file mode 100644 index ba05d33a358..00000000000 --- a/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.Metadata -public final enum class A$B$C { - // source: 'kt55769.kt' - public final inner class A$B - public final inner class A$B$C - public final enum static field C1: A$B$C - public final enum static field C2: A$B$C - public final enum static field C3: A$B$C - private synthetic final static field $VALUES: A$B$C[] - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private method (p0: java.lang.String, p1: int): void - public static method values(): A$B$C[] - public static method valueOf(p0: java.lang.String): A$B$C - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - private synthetic final static method $values(): A$B$C[] - static method (): void -} - -@kotlin.Metadata -public final class A$B { - // source: 'kt55769.kt' - public final inner class A$B - public final inner class A$B$C - public method (): void -} - -@kotlin.Metadata -public final class A { - // source: 'kt55769.kt' - public final inner class A$B - public method (): void -} - -@kotlin.Metadata -public final class Main { - // source: 'kt55769.kt' - public final inner class A$B - public final inner class A$B$C - private final @org.jetbrains.annotations.NotNull field field: A$B$C - public method (): void - public final @org.jetbrains.annotations.NotNull method getField(): A$B$C -} diff --git a/compiler/testData/codegen/bytecodeListing/kt55769.txt b/compiler/testData/codegen/bytecodeListing/kt55769.txt index 2cb23ab64c4..ba05d33a358 100644 --- a/compiler/testData/codegen/bytecodeListing/kt55769.txt +++ b/compiler/testData/codegen/bytecodeListing/kt55769.txt @@ -1,23 +1,26 @@ @kotlin.Metadata public final enum class A$B$C { // source: 'kt55769.kt' - public final inner class A$B$C public final inner class A$B + public final inner class A$B$C public final enum static field C1: A$B$C public final enum static field C2: A$B$C public final enum static field C3: A$B$C private synthetic final static field $VALUES: A$B$C[] - static method (): void + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private method (p0: java.lang.String, p1: int): void public static method values(): A$B$C[] public static method valueOf(p0: java.lang.String): A$B$C + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries + private synthetic final static method $values(): A$B$C[] + static method (): void } @kotlin.Metadata public final class A$B { // source: 'kt55769.kt' - public final inner class A$B$C public final inner class A$B + public final inner class A$B$C public method (): void } @@ -31,7 +34,9 @@ public final class A { @kotlin.Metadata public final class Main { // source: 'kt55769.kt' + public final inner class A$B + public final inner class A$B$C private final @org.jetbrains.annotations.NotNull field field: A$B$C - public final @org.jetbrains.annotations.NotNull method getField(): A$B$C public method (): void + public final @org.jetbrains.annotations.NotNull method getField(): A$B$C } diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.ir.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.ir.txt deleted file mode 100644 index 2e5c93c383e..00000000000 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.ir.txt +++ /dev/null @@ -1,9 +0,0 @@ -@kotlin.Metadata -public final class<Ljava/lang/Object;> A { - // source: 'genericClass.kt' - public final <()TT;> method f(): java.lang.Object - public final <()TT;> method getResult(): java.lang.Object - public <(TT;)V> method (p0: java.lang.Object): void - private final static <(LA;)TT;> method f$g(p0: A): java.lang.Object - private final field result: java.lang.Object -} diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.txt index 9d7b409e32c..2e5c93c383e 100644 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.txt +++ b/compiler/testData/codegen/bytecodeListing/localFunctions/genericClass.txt @@ -1,19 +1,9 @@ -@kotlin.Metadata -final class;> A$f$1 { - // source: 'genericClass.kt' - public final <()TT;> method invoke(): java.lang.Object - method (p0: A): void - enclosing method A.f()Ljava/lang/Object; - synthetic final field this$0: A - inner (anonymous) class A$f$1 -} - @kotlin.Metadata public final class<Ljava/lang/Object;> A { // source: 'genericClass.kt' public final <()TT;> method f(): java.lang.Object public final <()TT;> method getResult(): java.lang.Object public <(TT;)V> method (p0: java.lang.Object): void + private final static <(LA;)TT;> method f$g(p0: A): java.lang.Object private final field result: java.lang.Object - inner (anonymous) class A$f$1 } diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.ir.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.ir.txt deleted file mode 100644 index 9e9879326fc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -@kotlin.Metadata -public final class A$B$C { - // source: 'genericInnerClass.kt' - public <()V> method (p0: A$B): void - private final static <(TT;)V> method f$g(p0: java.lang.Object): void - public final method f(): void - synthetic final field .B;> this$0: A$B - public final inner class A$B - public final inner class A$B$C -} - -@kotlin.Metadata -public final class A$B { - // source: 'genericInnerClass.kt' - public <()V> method (p0: A): void - synthetic final field ;> this$0: A - public final inner class A$B - public final inner class A$B$C -} - -@kotlin.Metadata -public final class<Ljava/lang/Object;> A { - // source: 'genericInnerClass.kt' - public final <()TT;> method getResult(): java.lang.Object - public <(TT;)V> method (p0: java.lang.Object): void - private final field result: java.lang.Object - public final inner class A$B -} diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.txt index 49ca6af06eb..9e9879326fc 100644 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.txt +++ b/compiler/testData/codegen/bytecodeListing/localFunctions/genericInnerClass.txt @@ -1,24 +1,10 @@ -@kotlin.Metadata -final class;> A$B$C$f$1 { - // source: 'genericInnerClass.kt' - public final <(TT;)V> method invoke(p0: java.lang.Object): void - static method (): void - method (): void - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object - enclosing method A$B$C.f()V - public final static field INSTANCE: A$B$C$f$1 - inner (anonymous) class A$B$C$f$1 - public final inner class A$B - public final inner class A$B$C -} - @kotlin.Metadata public final class A$B$C { // source: 'genericInnerClass.kt' public <()V> method (p0: A$B): void + private final static <(TT;)V> method f$g(p0: java.lang.Object): void public final method f(): void - synthetic final field this$0: A$B - inner (anonymous) class A$B$C$f$1 + synthetic final field .B;> this$0: A$B public final inner class A$B public final inner class A$B$C } @@ -27,7 +13,7 @@ public final class A$B$C { public final class A$B { // source: 'genericInnerClass.kt' public <()V> method (p0: A): void - synthetic final field this$0: A + synthetic final field ;> this$0: A public final inner class A$B public final inner class A$B$C } diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.ir.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.ir.txt deleted file mode 100644 index 7c636919729..00000000000 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -@kotlin.Metadata -public final class<Ljava/lang/Object;> A$b$C { - // source: 'genericLocalClass.kt' - private final static <(TT;)TS;> method f$g(p0: java.lang.Object): java.lang.Object - public method (): void - public final method f(): void - enclosing method A.b()V - inner (local) class A$b$C C -} - -@kotlin.Metadata -public final class<Ljava/lang/Object;> A { - // source: 'genericLocalClass.kt' - public final <()TT;> method getResult(): java.lang.Object - public <(TT;)V> method (p0: java.lang.Object): void - public final method b(): void - private final field result: java.lang.Object - inner (local) class A$b$C C -} diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.txt index 3b701acd253..7c636919729 100644 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.txt +++ b/compiler/testData/codegen/bytecodeListing/localFunctions/genericLocalClass.txt @@ -1,22 +1,10 @@ -@kotlin.Metadata -final class;> A$b$C$f$1 { - // source: 'genericLocalClass.kt' - public final @org.jetbrains.annotations.Nullable <(TT;)TS;> method invoke(p0: java.lang.Object): java.lang.Object - static method (): void - method (): void - enclosing method A$b$C.f()V - public final static field INSTANCE: A$b$C$f$1 - inner (anonymous) class A$b$C$f$1 - inner (local) class A$b$C C -} - @kotlin.Metadata public final class<Ljava/lang/Object;> A$b$C { // source: 'genericLocalClass.kt' + private final static <(TT;)TS;> method f$g(p0: java.lang.Object): java.lang.Object public method (): void public final method f(): void enclosing method A.b()V - inner (anonymous) class A$b$C$f$1 inner (local) class A$b$C C } diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.ir.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.ir.txt deleted file mode 100644 index b20f2c19118..00000000000 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -@kotlin.Metadata -public final class C { - // source: 'inInitBlock.kt' - public method (): void - public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public method (p0: int): void - private final static method _init_$test$0$test(): void - private final static method _init_$test$0(): void - private final static method _init_$test$2$test$1(): void - private final static method _init_$test$2(): void - private final static method _init_$test$5(): void - private final static method test$5$test$4(): void - private final static method test$test$3(): void - public final method test(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.txt index 29ab5e671b9..b20f2c19118 100644 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.txt +++ b/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock.txt @@ -1,102 +1,15 @@ -@kotlin.Metadata -final class C$1$1 { - // source: 'inInitBlock.kt' - enclosing method C$1.invoke()V - public final static field INSTANCE: C$1$1 - inner (anonymous) class C$1 - inner (anonymous) class C$1$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class C$1 { - // source: 'inInitBlock.kt' - enclosing method C.(I)V - public final static field INSTANCE: C$1 - inner (anonymous) class C$1 - inner (anonymous) class C$1$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class C$2$1 { - // source: 'inInitBlock.kt' - enclosing method C$2.invoke()V - public final static field INSTANCE: C$2$1 - inner (anonymous) class C$2 - inner (anonymous) class C$2$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class C$2 { - // source: 'inInitBlock.kt' - enclosing method C.(Ljava/lang/String;)V - public final static field INSTANCE: C$2 - inner (anonymous) class C$2 - inner (anonymous) class C$2$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class C$3$1 { - // source: 'inInitBlock.kt' - enclosing method C$3.invoke()V - public final static field INSTANCE: C$3$1 - inner (anonymous) class C$3 - inner (anonymous) class C$3$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class C$3 { - // source: 'inInitBlock.kt' - enclosing method C.()V - public final static field INSTANCE: C$3 - inner (anonymous) class C$3 - inner (anonymous) class C$3$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class C$test$1 { - // source: 'inInitBlock.kt' - enclosing method C.test()V - public final static field INSTANCE: C$test$1 - inner (anonymous) class C$test$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - @kotlin.Metadata public final class C { // source: 'inInitBlock.kt' - inner (anonymous) class C$1 - inner (anonymous) class C$2 - inner (anonymous) class C$3 - inner (anonymous) class C$test$1 public method (): void public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public method (p0: int): void + private final static method _init_$test$0$test(): void + private final static method _init_$test$0(): void + private final static method _init_$test$2$test$1(): void + private final static method _init_$test$2(): void + private final static method _init_$test$5(): void + private final static method test$5$test$4(): void + private final static method test$test$3(): void public final method test(): void } diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/simple.ir.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/simple.ir.txt deleted file mode 100644 index 948c0c9e68f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/simple.ir.txt +++ /dev/null @@ -1,6 +0,0 @@ -@kotlin.Metadata -public final class SimpleKt { - // source: 'simple.kt' - private final static method foo$bar(): void - public final static method foo(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/simple.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/simple.txt index 3150760b3e1..948c0c9e68f 100644 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/simple.txt +++ b/compiler/testData/codegen/bytecodeListing/localFunctions/simple.txt @@ -1,18 +1,6 @@ -@kotlin.Metadata -final class SimpleKt$foo$1 { - // source: 'simple.kt' - enclosing method SimpleKt.foo()V - public final static field INSTANCE: SimpleKt$foo$1 - inner (anonymous) class SimpleKt$foo$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - @kotlin.Metadata public final class SimpleKt { // source: 'simple.kt' - inner (anonymous) class SimpleKt$foo$1 + private final static method foo$bar(): void public final static method foo(): void } diff --git a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.ir.txt b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.ir.txt deleted file mode 100644 index c5c61f10e4a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -@kotlin.Metadata -public final class Hello/Foo { - // source: 'multifileSuspend.kt' - public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic static method main(p0: java.lang.String[]): void -} - -@kotlin.Metadata -synthetic final class Hello/Foo__MultifileSuspendKt$main$2 { - // source: 'multifileSuspend.kt' - enclosing method Hello/Foo__MultifileSuspendKt.main([Ljava/lang/String;)V - private synthetic field args: java.lang.String[] - inner (anonymous) class Hello/Foo__MultifileSuspendKt$main$2 - method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -synthetic final class Hello/Foo__MultifileSuspendKt { - // source: 'multifileSuspend.kt' - inner (anonymous) class Hello/Foo__MultifileSuspendKt$main$2 - public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic static method main(p0: java.lang.String[]): void -} diff --git a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt index 3d9b2cf4d21..c5c61f10e4a 100644 --- a/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt +++ b/compiler/testData/codegen/bytecodeListing/main/multifileSuspend.txt @@ -6,15 +6,20 @@ public final class Hello/Foo { } @kotlin.Metadata -synthetic final class Hello/Foo__MultifileSuspendKt$$$main { - private synthetic final field args: java.lang.String[] - synthetic method (p0: java.lang.String[]): void - public synthetic final method invoke(p0: java.lang.Object): java.lang.Object +synthetic final class Hello/Foo__MultifileSuspendKt$main$2 { + // source: 'multifileSuspend.kt' + enclosing method Hello/Foo__MultifileSuspendKt.main([Ljava/lang/String;)V + private synthetic field args: java.lang.String[] + inner (anonymous) class Hello/Foo__MultifileSuspendKt$main$2 + method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata synthetic final class Hello/Foo__MultifileSuspendKt { // source: 'multifileSuspend.kt' + inner (anonymous) class Hello/Foo__MultifileSuspendKt$main$2 public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public synthetic static method main(p0: java.lang.String[]): void } diff --git a/compiler/testData/codegen/bytecodeListing/main/suspendMain.ir.txt b/compiler/testData/codegen/bytecodeListing/main/suspendMain.ir.txt deleted file mode 100644 index e6a7e09d002..00000000000 --- a/compiler/testData/codegen/bytecodeListing/main/suspendMain.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -@kotlin.Metadata -synthetic final class SuspendMainKt$main$2 { - // source: 'suspendMain.kt' - enclosing method SuspendMainKt.main([Ljava/lang/String;)V - private synthetic field args: java.lang.String[] - inner (anonymous) class SuspendMainKt$main$2 - method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void - public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -public final class SuspendMainKt { - // source: 'suspendMain.kt' - inner (anonymous) class SuspendMainKt$main$2 - public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic static method main(p0: java.lang.String[]): void -} diff --git a/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt b/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt index de639151f1a..e6a7e09d002 100644 --- a/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt +++ b/compiler/testData/codegen/bytecodeListing/main/suspendMain.txt @@ -1,13 +1,18 @@ @kotlin.Metadata -synthetic final class SuspendMainKt$$$main { - private synthetic final field args: java.lang.String[] - synthetic method (p0: java.lang.String[]): void - public synthetic final method invoke(p0: java.lang.Object): java.lang.Object +synthetic final class SuspendMainKt$main$2 { + // source: 'suspendMain.kt' + enclosing method SuspendMainKt.main([Ljava/lang/String;)V + private synthetic field args: java.lang.String[] + inner (anonymous) class SuspendMainKt$main$2 + method (@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void + public final @org.jetbrains.annotations.Nullable method invoke(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object + public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata public final class SuspendMainKt { // source: 'suspendMain.kt' + inner (anonymous) class SuspendMainKt$main$2 public final static @org.jetbrains.annotations.Nullable method main(@org.jetbrains.annotations.NotNull p0: java.lang.String[], @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public synthetic static method main(p0: java.lang.String[]): void } diff --git a/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.ir.txt b/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.ir.txt deleted file mode 100644 index 5986d221ff7..00000000000 --- a/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.ir.txt +++ /dev/null @@ -1,37 +0,0 @@ -@kotlin.Metadata -public final class A$DefaultImpls { - // source: 'noDelegationsToPrivateInterfaceMembers.kt' - private static method bar(p0: A): java.lang.String - public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: A): java.lang.String - private static method getLog(p0: A): java.lang.String - public final inner class A$DefaultImpls -} - -@kotlin.Metadata -public interface A { - // source: 'noDelegationsToPrivateInterfaceMembers.kt' - public abstract @org.jetbrains.annotations.NotNull method foo(): java.lang.String - public final inner class A$DefaultImpls -} - -@kotlin.Metadata -public final class B$DefaultImpls { - // source: 'noDelegationsToPrivateInterfaceMembers.kt' - public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: B): java.lang.String - public final inner class A$DefaultImpls - public final inner class B$DefaultImpls -} - -@kotlin.Metadata -public interface B { - // source: 'noDelegationsToPrivateInterfaceMembers.kt' - public final inner class B$DefaultImpls -} - -@kotlin.Metadata -public final class C { - // source: 'noDelegationsToPrivateInterfaceMembers.kt' - public method (): void - public @org.jetbrains.annotations.NotNull method foo(): java.lang.String - public final inner class B$DefaultImpls -} diff --git a/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt b/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt index dab64639b56..5986d221ff7 100644 --- a/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt +++ b/compiler/testData/codegen/bytecodeListing/noDelegationsToPrivateInterfaceMembers.txt @@ -18,6 +18,7 @@ public interface A { public final class B$DefaultImpls { // source: 'noDelegationsToPrivateInterfaceMembers.kt' public static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: B): java.lang.String + public final inner class A$DefaultImpls public final inner class B$DefaultImpls } @@ -32,4 +33,5 @@ public final class C { // source: 'noDelegationsToPrivateInterfaceMembers.kt' public method (): void public @org.jetbrains.annotations.NotNull method foo(): java.lang.String + public final inner class B$DefaultImpls } diff --git a/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.ir.txt b/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.ir.txt deleted file mode 100644 index 07c468749d7..00000000000 --- a/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.ir.txt +++ /dev/null @@ -1,68 +0,0 @@ -@kotlin.Metadata -public final class A { - // source: 'noReceiverInCallableReferenceClasses.kt' - private final field bar: int - public method (): void - public final method foo(): void - public final method getBar(): int -} - -@kotlin.Metadata -synthetic final class NoReceiverInCallableReferenceClassesKt$A_bar$1 { - // source: 'noReceiverInCallableReferenceClasses.kt' - enclosing class NoReceiverInCallableReferenceClassesKt - public final static field INSTANCE: NoReceiverInCallableReferenceClassesKt$A_bar$1 - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_bar$1 - static method (): void - method (): void - public method get(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -synthetic final class NoReceiverInCallableReferenceClassesKt$A_foo$1 { - // source: 'noReceiverInCallableReferenceClasses.kt' - enclosing class NoReceiverInCallableReferenceClassesKt - public final static field INSTANCE: NoReceiverInCallableReferenceClassesKt$A_foo$1 - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_foo$1 - static method (): void - method (): void - public final method invoke(p0: A): void - public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object -} - -@kotlin.Metadata -synthetic final class NoReceiverInCallableReferenceClassesKt$aBar$1 { - // source: 'noReceiverInCallableReferenceClasses.kt' - enclosing class NoReceiverInCallableReferenceClassesKt - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aBar$1 - method (p0: java.lang.Object): void - public method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class NoReceiverInCallableReferenceClassesKt$aFoo$1 { - // source: 'noReceiverInCallableReferenceClasses.kt' - enclosing class NoReceiverInCallableReferenceClassesKt - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aFoo$1 - method (p0: java.lang.Object): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -public final class NoReceiverInCallableReferenceClassesKt { - // source: 'noReceiverInCallableReferenceClasses.kt' - private final static @org.jetbrains.annotations.NotNull field A_bar: kotlin.reflect.KProperty1 - private final static @org.jetbrains.annotations.NotNull field A_foo: kotlin.reflect.KFunction - private final static @org.jetbrains.annotations.NotNull field aBar: kotlin.reflect.KProperty0 - private final static @org.jetbrains.annotations.NotNull field aFoo: kotlin.reflect.KFunction - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_bar$1 - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_foo$1 - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aBar$1 - inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aFoo$1 - static method (): void - public final static @org.jetbrains.annotations.NotNull method getABar(): kotlin.reflect.KProperty0 - public final static @org.jetbrains.annotations.NotNull method getAFoo(): kotlin.reflect.KFunction - public final static @org.jetbrains.annotations.NotNull method getA_bar(): kotlin.reflect.KProperty1 - public final static @org.jetbrains.annotations.NotNull method getA_foo(): kotlin.reflect.KFunction -} diff --git a/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt b/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt index d0cefadd324..07c468749d7 100644 --- a/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt +++ b/compiler/testData/codegen/bytecodeListing/noReceiverInCallableReferenceClasses.txt @@ -10,10 +10,12 @@ public final class A { @kotlin.Metadata synthetic final class NoReceiverInCallableReferenceClassesKt$A_bar$1 { // source: 'noReceiverInCallableReferenceClasses.kt' - public final static field INSTANCE: kotlin.reflect.KProperty1 + enclosing class NoReceiverInCallableReferenceClassesKt + public final static field INSTANCE: NoReceiverInCallableReferenceClassesKt$A_bar$1 + inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_bar$1 static method (): void method (): void - public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object + public method get(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata @@ -24,15 +26,17 @@ synthetic final class NoReceiverInCallableReferenceClassesKt$A_foo$1 { inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_foo$1 static method (): void method (): void - public final method invoke(@org.jetbrains.annotations.NotNull p0: A): void + public final method invoke(p0: A): void public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @kotlin.Metadata synthetic final class NoReceiverInCallableReferenceClassesKt$aBar$1 { // source: 'noReceiverInCallableReferenceClasses.kt' - method (p0: A): void - public @org.jetbrains.annotations.Nullable method get(): java.lang.Object + enclosing class NoReceiverInCallableReferenceClassesKt + inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aBar$1 + method (p0: java.lang.Object): void + public method get(): java.lang.Object } @kotlin.Metadata @@ -40,7 +44,7 @@ synthetic final class NoReceiverInCallableReferenceClassesKt$aFoo$1 { // source: 'noReceiverInCallableReferenceClasses.kt' enclosing class NoReceiverInCallableReferenceClassesKt inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aFoo$1 - method (p0: A): void + method (p0: java.lang.Object): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -52,7 +56,9 @@ public final class NoReceiverInCallableReferenceClassesKt { private final static @org.jetbrains.annotations.NotNull field A_foo: kotlin.reflect.KFunction private final static @org.jetbrains.annotations.NotNull field aBar: kotlin.reflect.KProperty0 private final static @org.jetbrains.annotations.NotNull field aFoo: kotlin.reflect.KFunction + inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_bar$1 inner (anonymous) class NoReceiverInCallableReferenceClassesKt$A_foo$1 + inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aBar$1 inner (anonymous) class NoReceiverInCallableReferenceClassesKt$aFoo$1 static method (): void public final static @org.jetbrains.annotations.NotNull method getABar(): kotlin.reflect.KProperty0 diff --git a/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.ir.txt b/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.ir.txt deleted file mode 100644 index 2a87dfbc8d8..00000000000 --- a/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.ir.txt +++ /dev/null @@ -1,55 +0,0 @@ -@kotlin.Metadata -public abstract class A { - // source: 'noRemoveAtInReadOnly.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class B { - // source: 'noRemoveAtInReadOnly.kt' - public method (): void - public method add(p0: int): boolean - public method add(p0: int, p1: int): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method indexOf(p0: int): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: int): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): int - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: int): java.lang.Integer - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.txt b/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.txt index a0fc1ecfb96..2a87dfbc8d8 100644 --- a/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.txt +++ b/compiler/testData/codegen/bytecodeListing/noRemoveAtInReadOnly.txt @@ -7,10 +7,7 @@ public abstract class A { public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Object @@ -30,8 +27,8 @@ public abstract class B { public method (): void public method add(p0: int): boolean public method add(p0: int, p1: int): void - public synthetic method add(p0: int, p1: java.lang.Object): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -45,12 +42,12 @@ public abstract class B { public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): int - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public method set(p0: int, p1: int): java.lang.Integer - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public bridge final method size(): int public method subList(p0: int, p1: int): java.util.List public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.ir.txt b/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.ir.txt deleted file mode 100644 index 8682eb7e4ec..00000000000 --- a/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.ir.txt +++ /dev/null @@ -1,40 +0,0 @@ -@kotlin.Metadata -final class SamAdapterForJavaInterfaceWithNullabilityKt$testNoAnnotation$1 { - // source: 'samAdapterForJavaInterfaceWithNullability.kt' - enclosing method SamAdapterForJavaInterfaceWithNullabilityKt.testNoAnnotation(Ljava/lang/String;)LJNoAnnotation; - synthetic final field $s: java.lang.String - inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNoAnnotation$1 - method (p0: java.lang.String): void - public final method getString(): java.lang.String -} - -@kotlin.Metadata -final class SamAdapterForJavaInterfaceWithNullabilityKt$testNotNull$1 { - // source: 'samAdapterForJavaInterfaceWithNullability.kt' - enclosing method SamAdapterForJavaInterfaceWithNullabilityKt.testNotNull(Ljava/lang/String;)LJNotNull; - synthetic final field $s: java.lang.String - inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNotNull$1 - method (p0: java.lang.String): void - public final method getNullableString(): java.lang.String -} - -@kotlin.Metadata -final class SamAdapterForJavaInterfaceWithNullabilityKt$testNullable$1 { - // source: 'samAdapterForJavaInterfaceWithNullability.kt' - enclosing method SamAdapterForJavaInterfaceWithNullabilityKt.testNullable(Ljava/lang/String;)LJNullable; - synthetic final field $s: java.lang.String - inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNullable$1 - method (p0: java.lang.String): void - public final method getNullableString(): java.lang.String -} - -@kotlin.Metadata -public final class SamAdapterForJavaInterfaceWithNullabilityKt { - // source: 'samAdapterForJavaInterfaceWithNullability.kt' - inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNoAnnotation$1 - inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNotNull$1 - inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNullable$1 - public final static @org.jetbrains.annotations.NotNull method testNoAnnotation(@org.jetbrains.annotations.NotNull p0: java.lang.String): JNoAnnotation - public final static @org.jetbrains.annotations.NotNull method testNotNull(@org.jetbrains.annotations.NotNull p0: java.lang.String): JNotNull - public final static @org.jetbrains.annotations.NotNull method testNullable(@org.jetbrains.annotations.NotNull p0: java.lang.String): JNullable -} diff --git a/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.txt b/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.txt index 6e13d1f0c1f..8682eb7e4ec 100644 --- a/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.txt +++ b/compiler/testData/codegen/bytecodeListing/nullabilityAnnotations/samAdapterForJavaInterfaceWithNullability.txt @@ -15,7 +15,7 @@ final class SamAdapterForJavaInterfaceWithNullabilityKt$testNotNull$1 { synthetic final field $s: java.lang.String inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNotNull$1 method (p0: java.lang.String): void - public final @org.jetbrains.annotations.NotNull method getNullableString(): java.lang.String + public final method getNullableString(): java.lang.String } @kotlin.Metadata @@ -25,7 +25,7 @@ final class SamAdapterForJavaInterfaceWithNullabilityKt$testNullable$1 { synthetic final field $s: java.lang.String inner (anonymous) class SamAdapterForJavaInterfaceWithNullabilityKt$testNullable$1 method (p0: java.lang.String): void - public final @org.jetbrains.annotations.Nullable method getNullableString(): java.lang.String + public final method getNullableString(): java.lang.String } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/privateCompanionFields.ir.txt b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.ir.txt deleted file mode 100644 index 96921dc8507..00000000000 --- a/compiler/testData/codegen/bytecodeListing/privateCompanionFields.ir.txt +++ /dev/null @@ -1,79 +0,0 @@ -@kotlin.Metadata -final class TestClass$Companion { - // source: 'privateCompanionFields.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - private final inner class TestClass$Companion -} - -@kotlin.Metadata -public final class TestClass { - // source: 'privateCompanionFields.kt' - private final static @org.jetbrains.annotations.NotNull field Companion: TestClass$Companion - public deprecated static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test2: java.lang.String - public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String - public deprecated static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test: java.lang.String - public deprecated final static @java.lang.Deprecated field testConst: int - static method (): void - public method (): void - private final inner class TestClass$Companion -} - -@kotlin.Metadata -final class TestClass2$Companion { - // source: 'privateCompanionFields.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public final @org.jetbrains.annotations.NotNull method getTestPublic(): java.lang.String - private final inner class TestClass2$Companion -} - -@kotlin.Metadata -public final class TestClass2 { - // source: 'privateCompanionFields.kt' - private final static @org.jetbrains.annotations.NotNull field Companion: TestClass2$Companion - private final static @org.jetbrains.annotations.NotNull field testPrivate: java.lang.String - private final static @org.jetbrains.annotations.NotNull field testPublic: java.lang.String - public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field testPublicConst: java.lang.String - static method (): void - public method (): void - public synthetic final static method access$getTestPublic$cp(): java.lang.String - private final inner class TestClass2$Companion -} - -@kotlin.Metadata -final class TestConst$Companion { - // source: 'privateCompanionFields.kt' - synthetic final static field $$INSTANCE: TestConst$Companion - public final static field testConst: int - static method (): void - private method (): void - public final inner class TestConst$Companion -} - -@kotlin.Metadata -public interface TestConst { - // source: 'privateCompanionFields.kt' - public synthetic final static field Companion: TestConst$Companion - public deprecated final static @java.lang.Deprecated field testConst: int - static method (): void - public final inner class TestConst$Companion -} - -@kotlin.Metadata -final class TestJvmField$Companion { - // source: 'privateCompanionFields.kt' - synthetic final static field $$INSTANCE: TestJvmField$Companion - static method (): void - private method (): void - public final inner class TestJvmField$Companion -} - -@kotlin.Metadata -public interface TestJvmField { - // source: 'privateCompanionFields.kt' - public synthetic final static field Companion: TestJvmField$Companion - public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String - static method (): void - public final inner class TestJvmField$Companion -} diff --git a/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt index e07f939bd10..96921dc8507 100644 --- a/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt +++ b/compiler/testData/codegen/bytecodeListing/privateCompanionFields.txt @@ -32,8 +32,8 @@ final class TestClass2$Companion { public final class TestClass2 { // source: 'privateCompanionFields.kt' private final static @org.jetbrains.annotations.NotNull field Companion: TestClass2$Companion - private deprecated final static @java.lang.Deprecated field testPrivate: java.lang.String - private deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field testPublic: java.lang.String + private final static @org.jetbrains.annotations.NotNull field testPrivate: java.lang.String + private final static @org.jetbrains.annotations.NotNull field testPublic: java.lang.String public deprecated final static @java.lang.Deprecated @org.jetbrains.annotations.NotNull field testPublicConst: java.lang.String static method (): void public method (): void @@ -54,7 +54,7 @@ final class TestConst$Companion { @kotlin.Metadata public interface TestConst { // source: 'privateCompanionFields.kt' - public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestConst$Companion + public synthetic final static field Companion: TestConst$Companion public deprecated final static @java.lang.Deprecated field testConst: int static method (): void public final inner class TestConst$Companion @@ -64,15 +64,15 @@ public interface TestConst { final class TestJvmField$Companion { // source: 'privateCompanionFields.kt' synthetic final static field $$INSTANCE: TestJvmField$Companion + static method (): void private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public final inner class TestJvmField$Companion } @kotlin.Metadata public interface TestJvmField { // source: 'privateCompanionFields.kt' - public synthetic final static @org.jetbrains.annotations.NotNull field Companion: TestJvmField$Companion + public synthetic final static field Companion: TestJvmField$Companion public deprecated final static @java.lang.Deprecated @kotlin.jvm.JvmField @org.jetbrains.annotations.NotNull field test3: java.lang.String static method (): void public final inner class TestJvmField$Companion diff --git a/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.ir.txt b/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.ir.txt deleted file mode 100644 index ee36bf71a3b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -@kotlin.Metadata -public final class<Ljava/lang/Object;> GenericIn { - // source: 'rawTypeInSignature.kt' - public method (): void -} - -@kotlin.Metadata -public final class<Ljava/lang/Object;> GenericInv { - // source: 'rawTypeInSignature.kt' - public method (): void -} - -@kotlin.Metadata -public final class<Ljava/lang/Object;> GenericOut { - // source: 'rawTypeInSignature.kt' - public method (): void -} - -@kotlin.Metadata -public final class KRaw { - // source: 'rawTypeInSignature.kt' - public <(Ljava/util/List;Ljava/util/List;)Ljava/util/List;> method bothRawAndGeneric(p0: java.util.List, p1: java.util.List): java.util.List - public method (@org.jetbrains.annotations.NotNull p0: JRaw): void - public method returnsRawGenericIn(): GenericIn - public method returnsRawGenericInv(): GenericInv - public method returnsRawGenericOut(): GenericOut - public method returnsRawList(): java.util.List - public method takesRawGenericIn(p0: GenericIn): void - public method takesRawGenericInv(p0: GenericInv): void - public method takesRawGenericOut(p0: GenericOut): void - public method takesRawList(p0: java.util.List): void - private synthetic final field $$delegate_0: JRaw -} - -@kotlin.Metadata -public final class RawTypeInSignatureKt { - // source: 'rawTypeInSignature.kt' - public final static <(LJRaw;Ljava/util/List<+Ljava/lang/Object;>;)Ljava/util/List;> method testBothRawAndGeneric(@org.jetbrains.annotations.NotNull p0: JRaw, @org.jetbrains.annotations.NotNull p1: java.util.List): java.util.List - public final static method testReturnsRawGenericIn(@org.jetbrains.annotations.NotNull p0: JRaw): GenericIn - public final static method testReturnsRawGenericInv(@org.jetbrains.annotations.NotNull p0: JRaw): GenericInv - public final static method testReturnsRawGenericOut(@org.jetbrains.annotations.NotNull p0: JRaw): GenericOut -} diff --git a/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.txt b/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.txt index d789d39b7f9..ee36bf71a3b 100644 --- a/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.txt +++ b/compiler/testData/codegen/bytecodeListing/rawTypeInSignature.txt @@ -19,24 +19,24 @@ public final class<Ljava/lang/Object;> GenericOut { @kotlin.Metadata public final class KRaw { // source: 'rawTypeInSignature.kt' - public <()LGenericIn;> method returnsRawGenericIn(): GenericIn - public <()LGenericInv;> method returnsRawGenericInv(): GenericInv - public <()LGenericOut;> method returnsRawGenericOut(): GenericOut - public <()Ljava/util/List;> method returnsRawList(): java.util.List - public <(LGenericIn<-Ljava/lang/Number;>;)V> method takesRawGenericIn(p0: GenericIn): void - public <(LGenericInv;)V> method takesRawGenericInv(p0: GenericInv): void - public <(LGenericOut<+Ljava/lang/Number;>;)V> method takesRawGenericOut(p0: GenericOut): void - public <(Ljava/util/List;)V> method takesRawList(p0: java.util.List): void - public <(Ljava/util/List;Ljava/util/List;)Ljava/util/List;> method bothRawAndGeneric(p0: java.util.List, p1: java.util.List): java.util.List + public <(Ljava/util/List;Ljava/util/List;)Ljava/util/List;> method bothRawAndGeneric(p0: java.util.List, p1: java.util.List): java.util.List public method (@org.jetbrains.annotations.NotNull p0: JRaw): void + public method returnsRawGenericIn(): GenericIn + public method returnsRawGenericInv(): GenericInv + public method returnsRawGenericOut(): GenericOut + public method returnsRawList(): java.util.List + public method takesRawGenericIn(p0: GenericIn): void + public method takesRawGenericInv(p0: GenericInv): void + public method takesRawGenericOut(p0: GenericOut): void + public method takesRawList(p0: java.util.List): void private synthetic final field $$delegate_0: JRaw } @kotlin.Metadata public final class RawTypeInSignatureKt { // source: 'rawTypeInSignature.kt' - public final static <(LJRaw;)LGenericIn;> method testReturnsRawGenericIn(@org.jetbrains.annotations.NotNull p0: JRaw): GenericIn - public final static <(LJRaw;)LGenericInv;> method testReturnsRawGenericInv(@org.jetbrains.annotations.NotNull p0: JRaw): GenericInv - public final static <(LJRaw;)LGenericOut;> method testReturnsRawGenericOut(@org.jetbrains.annotations.NotNull p0: JRaw): GenericOut - public final static <(LJRaw;Ljava/util/List<+Ljava/lang/Object;>;)Ljava/util/List;> method testBothRawAndGeneric(@org.jetbrains.annotations.NotNull p0: JRaw, @org.jetbrains.annotations.NotNull p1: java.util.List): java.util.List + public final static <(LJRaw;Ljava/util/List<+Ljava/lang/Object;>;)Ljava/util/List;> method testBothRawAndGeneric(@org.jetbrains.annotations.NotNull p0: JRaw, @org.jetbrains.annotations.NotNull p1: java.util.List): java.util.List + public final static method testReturnsRawGenericIn(@org.jetbrains.annotations.NotNull p0: JRaw): GenericIn + public final static method testReturnsRawGenericInv(@org.jetbrains.annotations.NotNull p0: JRaw): GenericInv + public final static method testReturnsRawGenericOut(@org.jetbrains.annotations.NotNull p0: JRaw): GenericOut } diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.ir.txt deleted file mode 100644 index 6331cfc79bb..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -@kotlin.Metadata -public interface<Ljava/lang/Object;> Sam { - // source: 't.kt' - public abstract <()TT;> method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class TKt$genericSam$1 { - // source: 't.kt' - public final <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function - public final <()TT;> method get(): java.lang.Object - static method (): void - method (): void - public final method equals(p0: java.lang.Object): boolean - public final method hashCode(): int - enclosing method TKt.genericSam()Ljava/lang/Object; - public final static field INSTANCE: TKt$genericSam$1 - inner (anonymous) class TKt$genericSam$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <()TT;> method foo(): java.lang.Object - public final static <()TT;> method genericSam(): java.lang.Object - public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object - inner (anonymous) class TKt$genericSam$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt index a6801a24c05..6331cfc79bb 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt @@ -5,29 +5,19 @@ public interface<Ljava/lang/Object;> Sam { } @kotlin.Metadata -synthetic final class;> TKt$genericSam$1 { +synthetic final class TKt$genericSam$1 { // source: 't.kt' - public final <()TT;> method invoke(): java.lang.Object + public final <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function + public final <()TT;> method get(): java.lang.Object static method (): void method (): void + public final method equals(p0: java.lang.Object): boolean + public final method hashCode(): int enclosing method TKt.genericSam()Ljava/lang/Object; public final static field INSTANCE: TKt$genericSam$1 inner (anonymous) class TKt$genericSam$1 } -@kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void - public method equals(p0: java.lang.Object): boolean - public synthetic final method get(): java.lang.Object - public method getFunctionDelegate(): kotlin.Function - public method hashCode(): int - enclosing method TKt.genericSam()Ljava/lang/Object; - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - @kotlin.Metadata public final class TKt { // source: 't.kt' @@ -35,5 +25,4 @@ public final class TKt { public final static <()TT;> method genericSam(): java.lang.Object public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object inner (anonymous) class TKt$genericSam$1 - inner (anonymous) class TKt$sam$Sam$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.ir.txt deleted file mode 100644 index 1b1bc1e9dce..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -@kotlin.Metadata -synthetic final class TKt$genericSam$1 { - // source: 't.kt' - public final <()TT;> method get(): java.lang.Object - static method (): void - method (): void - enclosing method TKt.genericSam()Ljava/lang/Object; - public final static field INSTANCE: TKt$genericSam$1 - inner (anonymous) class TKt$genericSam$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <()TT;> method foo(): java.lang.Object - public final static <()TT;> method genericSam(): java.lang.Object - inner (anonymous) class TKt$genericSam$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt index db0256e7d81..1b1bc1e9dce 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt @@ -1,7 +1,7 @@ @kotlin.Metadata -synthetic final class;> TKt$genericSam$1 { +synthetic final class TKt$genericSam$1 { // source: 't.kt' - public final <()TT;> method invoke(): java.lang.Object + public final <()TT;> method get(): java.lang.Object static method (): void method (): void enclosing method TKt.genericSam()Ljava/lang/Object; @@ -9,21 +9,10 @@ synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method get(): java.lang.Object - enclosing method TKt.genericSam()Ljava/lang/Object; - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - @kotlin.Metadata public final class TKt { // source: 't.kt' public final static <()TT;> method foo(): java.lang.Object public final static <()TT;> method genericSam(): java.lang.Object inner (anonymous) class TKt$genericSam$1 - inner (anonymous) class TKt$sam$Sam$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.ir.txt deleted file mode 100644 index 71bbc9f990a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -@kotlin.Metadata -public interface<Ljava/lang/Object;> Sam { - // source: 't.kt' - public abstract <()TT;> method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class TKt$specializedSam$1 { - // source: 't.kt' - public final <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function - static method (): void - method (): void - public final method equals(p0: java.lang.Object): boolean - public synthetic bridge method get(): java.lang.Object - public final method get(): java.lang.String - public final method hashCode(): int - enclosing method TKt.specializedSam()Ljava/lang/String; - public final static field INSTANCE: TKt$specializedSam$1 - inner (anonymous) class TKt$specializedSam$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object - public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String - public final static @org.jetbrains.annotations.NotNull method specializedSam(): java.lang.String - inner (anonymous) class TKt$specializedSam$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt index 37996d7eeec..71bbc9f990a 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt @@ -5,25 +5,15 @@ public interface<Ljava/lang/Object;> Sam { } @kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void - public method equals(p0: java.lang.Object): boolean - public synthetic final method get(): java.lang.Object - public method getFunctionDelegate(): kotlin.Function - public method hashCode(): int - enclosing method TKt.specializedSam()Ljava/lang/String; - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - -@kotlin.Metadata -synthetic final class;> TKt$specializedSam$1 { +synthetic final class TKt$specializedSam$1 { // source: 't.kt' + public final <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function static method (): void method (): void - public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public final method equals(p0: java.lang.Object): boolean + public synthetic bridge method get(): java.lang.Object + public final method get(): java.lang.String + public final method hashCode(): int enclosing method TKt.specializedSam()Ljava/lang/String; public final static field INSTANCE: TKt$specializedSam$1 inner (anonymous) class TKt$specializedSam$1 @@ -35,6 +25,5 @@ public final class TKt { public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String public final static @org.jetbrains.annotations.NotNull method specializedSam(): java.lang.String - inner (anonymous) class TKt$sam$Sam$0 inner (anonymous) class TKt$specializedSam$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.ir.txt deleted file mode 100644 index cd9d00882fe..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -@kotlin.Metadata -synthetic final class TKt$specializedSam$1 { - // source: 't.kt' - static method (): void - method (): void - public synthetic bridge method get(): java.lang.Object - public final method get(): java.lang.String - enclosing method TKt.specializedSam()Ljava/lang/String; - public final static field INSTANCE: TKt$specializedSam$1 - inner (anonymous) class TKt$specializedSam$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String - public final static @org.jetbrains.annotations.NotNull method specializedSam(): java.lang.String - inner (anonymous) class TKt$specializedSam$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt index aa2260f29ed..cd9d00882fe 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt @@ -1,20 +1,10 @@ @kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method get(): java.lang.Object - enclosing method TKt.specializedSam()Ljava/lang/String; - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - -@kotlin.Metadata -synthetic final class;> TKt$specializedSam$1 { +synthetic final class TKt$specializedSam$1 { // source: 't.kt' static method (): void method (): void - public synthetic bridge method invoke(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String + public synthetic bridge method get(): java.lang.Object + public final method get(): java.lang.String enclosing method TKt.specializedSam()Ljava/lang/String; public final static field INSTANCE: TKt$specializedSam$1 inner (anonymous) class TKt$specializedSam$1 @@ -25,6 +15,5 @@ public final class TKt { // source: 't.kt' public final static @org.jetbrains.annotations.NotNull method foo(): java.lang.String public final static @org.jetbrains.annotations.NotNull method specializedSam(): java.lang.String - inner (anonymous) class TKt$sam$Sam$0 inner (anonymous) class TKt$specializedSam$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.ir.txt deleted file mode 100644 index e3ddc0db865..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -@kotlin.Metadata -public interface<Ljava/lang/Object;> Sam { - // source: 't.kt' - public abstract <()TT;> method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - public final @org.jetbrains.annotations.NotNull <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function - method (p0: kotlin.jvm.functions.Function0): void - public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public synthetic final method get(): java.lang.Object - public final method hashCode(): int - enclosing class TKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object - public final static <(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - inner (anonymous) class TKt$sam$Sam$0 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt index a5ebadb9da7..e3ddc0db865 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt @@ -7,12 +7,12 @@ public interface<Ljava/lang/Object;> Sam { @kotlin.Metadata synthetic final class TKt$sam$Sam$0 { // source: 't.kt' + public final @org.jetbrains.annotations.NotNull <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function method (p0: kotlin.jvm.functions.Function0): void - public method equals(p0: java.lang.Object): boolean + public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public synthetic final method get(): java.lang.Object - public method getFunctionDelegate(): kotlin.Function - public method hashCode(): int - enclosing method TKt.genericSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; + public final method hashCode(): int + enclosing class TKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$sam$Sam$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.ir.txt deleted file mode 100644 index 730f7bff931..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.ir.txt +++ /dev/null @@ -1,16 +0,0 @@ -@kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method get(): java.lang.Object - enclosing class TKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - inner (anonymous) class TKt$sam$Sam$0 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt index 863d85589c5..730f7bff931 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt @@ -3,7 +3,7 @@ synthetic final class TKt$sam$Sam$0 { // source: 't.kt' method (p0: kotlin.jvm.functions.Function0): void public synthetic final method get(): java.lang.Object - enclosing method TKt.genericSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; + enclosing class TKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$sam$Sam$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.kt b/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.kt index 8f3768c47b6..3a2b30285a6 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.kt +++ b/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM // WITH_SIGNATURES // WITH_STDLIB diff --git a/compiler/testData/codegen/bytecodeListing/sam/kt16650.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/kt16650.ir.txt deleted file mode 100644 index 5126fc04ca2..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/kt16650.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -@kotlin.Metadata -final class<Ljava/lang/Object;LKeySelector;> TKt$main$1 { - // source: 't.kt' - static method (): void - method (): void - public final method getKey(p0: java.lang.Integer): java.lang.Long - public synthetic bridge method getKey(p0: java.lang.Object): java.lang.Object - enclosing method TKt.main(LDataStream;)V - public final static field ;> INSTANCE: TKt$main$1 - inner (anonymous) class TKt$main$1 -} - -@kotlin.Metadata -final class<Ljava/lang/Object;LKeySelector;> TKt$main$2 { - // source: 't.kt' - static method (): void - method (): void - public final method getKey(p0: java.lang.Integer): java.lang.Long - public synthetic bridge method getKey(p0: java.lang.Object): java.lang.Object - enclosing method TKt.main(LDataStream;)V - public final static field ;> INSTANCE: TKt$main$2 - inner (anonymous) class TKt$main$2 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(LDataStream;)V> method main(@org.jetbrains.annotations.NotNull p0: DataStream): void - inner (anonymous) class TKt$main$1 - inner (anonymous) class TKt$main$2 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt b/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt index 8e0961d77c9..5126fc04ca2 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt @@ -6,7 +6,7 @@ final class<Ljava/lang/Object;LKeyS public final method getKey(p0: java.lang.Integer): java.lang.Long public synthetic bridge method getKey(p0: java.lang.Object): java.lang.Object enclosing method TKt.main(LDataStream;)V - public final static field INSTANCE: TKt$main$1 + public final static field ;> INSTANCE: TKt$main$1 inner (anonymous) class TKt$main$1 } @@ -18,7 +18,7 @@ final class<Ljava/lang/Object;LKeyS public final method getKey(p0: java.lang.Integer): java.lang.Long public synthetic bridge method getKey(p0: java.lang.Object): java.lang.Object enclosing method TKt.main(LDataStream;)V - public final static field INSTANCE: TKt$main$2 + public final static field ;> INSTANCE: TKt$main$2 inner (anonymous) class TKt$main$2 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.ir.txt deleted file mode 100644 index 8f63b3d4373..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -@kotlin.Metadata -public interface<Ljava/lang/Object;> Sam { - // source: 't.kt' - public abstract <()TT;> method get(): java.lang.Object -} - -@kotlin.Metadata -final class<Ljava/lang/Object;LSam;> TKt$genericSamGet$1 { - // source: 't.kt' - public final <()TT;> method get(): java.lang.Object - <(Lkotlin/jvm/functions/Function0<+TT;>;)V> method (p0: kotlin.jvm.functions.Function0): void - enclosing method TKt.genericSamGet(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; - synthetic final field ;> $f: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$genericSamGet$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object - public final static <(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSamGet(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - inner (anonymous) class TKt$genericSamGet$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.txt index be364dd5f6b..8f63b3d4373 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.txt @@ -8,9 +8,9 @@ public interface<Ljava/lang/Object;> Sam { final class<Ljava/lang/Object;LSam;> TKt$genericSamGet$1 { // source: 't.kt' public final <()TT;> method get(): java.lang.Object - method (p0: kotlin.jvm.functions.Function0): void + <(Lkotlin/jvm/functions/Function0<+TT;>;)V> method (p0: kotlin.jvm.functions.Function0): void enclosing method TKt.genericSamGet(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; - synthetic final field $f: kotlin.jvm.functions.Function0 + synthetic final field ;> $f: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$genericSamGet$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.ir.txt deleted file mode 100644 index eecd60944bf..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -@kotlin.Metadata -final class<Ljava/lang/Object;LSam;> TKt$genericSam$1 { - // source: 't.kt' - public final <()TT;> method get(): java.lang.Object - <(Lkotlin/jvm/functions/Function0<+TT;>;)V> method (p0: kotlin.jvm.functions.Function0): void - enclosing method TKt.genericSam(Lkotlin/jvm/functions/Function0;)LSam; - synthetic final field ;> $f: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$genericSam$1 -} - -@kotlin.Metadata -final class<Ljava/lang/Object;LSam;> TKt$genericSamGet$1 { - // source: 't.kt' - public final <()TT;> method get(): java.lang.Object - <(Lkotlin/jvm/functions/Function0<+TT;>;)V> method (p0: kotlin.jvm.functions.Function0): void - enclosing method TKt.genericSamGet(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; - synthetic final field ;> $f: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$genericSamGet$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<+TT;>;)LSam;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): Sam - public final static <(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSamGet(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object - inner (anonymous) class TKt$genericSam$1 - inner (anonymous) class TKt$genericSamGet$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.txt index 62cbf730418..eecd60944bf 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/lambdaGenericSamInterface.txt @@ -2,9 +2,9 @@ final class<Ljava/lang/Object;LSam;> TKt$genericSam$1 { // source: 't.kt' public final <()TT;> method get(): java.lang.Object - method (p0: kotlin.jvm.functions.Function0): void + <(Lkotlin/jvm/functions/Function0<+TT;>;)V> method (p0: kotlin.jvm.functions.Function0): void enclosing method TKt.genericSam(Lkotlin/jvm/functions/Function0;)LSam; - synthetic final field $f: kotlin.jvm.functions.Function0 + synthetic final field ;> $f: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$genericSam$1 } @@ -12,9 +12,9 @@ final class<Ljava/lang/Object;LSam;> TKt$genericSam$1 { final class<Ljava/lang/Object;LSam;> TKt$genericSamGet$1 { // source: 't.kt' public final <()TT;> method get(): java.lang.Object - method (p0: kotlin.jvm.functions.Function0): void + <(Lkotlin/jvm/functions/Function0<+TT;>;)V> method (p0: kotlin.jvm.functions.Function0): void enclosing method TKt.genericSamGet(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; - synthetic final field $f: kotlin.jvm.functions.Function0 + synthetic final field ;> $f: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$genericSamGet$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.ir.txt deleted file mode 100644 index 1bd37c15bb4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -@kotlin.Metadata -public interface<Ljava/lang/Object;> Sam { - // source: 't.kt' - public abstract <()TT;> method get(): java.lang.Object -} - -@kotlin.Metadata -final class<Ljava/lang/Object;LSam;> TKt$specializedSam$1 { - // source: 't.kt' - <(Lkotlin/jvm/functions/Function0;)V> method (p0: kotlin.jvm.functions.Function0): void - public synthetic bridge method get(): java.lang.Object - public final method get(): java.lang.String - enclosing method TKt.specializedSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/String; - synthetic final field ;> $f: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$specializedSam$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String - public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object - inner (anonymous) class TKt$specializedSam$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.txt index 17c6d65bf22..1bd37c15bb4 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedFunInterface.txt @@ -7,11 +7,11 @@ public interface<Ljava/lang/Object;> Sam { @kotlin.Metadata final class<Ljava/lang/Object;LSam;> TKt$specializedSam$1 { // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void + <(Lkotlin/jvm/functions/Function0;)V> method (p0: kotlin.jvm.functions.Function0): void public synthetic bridge method get(): java.lang.Object - public final @org.jetbrains.annotations.NotNull method get(): java.lang.String + public final method get(): java.lang.String enclosing method TKt.specializedSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/String; - synthetic final field $f: kotlin.jvm.functions.Function0 + synthetic final field ;> $f: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$specializedSam$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.ir.txt deleted file mode 100644 index 7c3aa366fd9..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -@kotlin.Metadata -final class<Ljava/lang/Object;LSam;> TKt$specializedSam$1 { - // source: 't.kt' - <(Lkotlin/jvm/functions/Function0;)V> method (p0: kotlin.jvm.functions.Function0): void - public synthetic bridge method get(): java.lang.Object - public final method get(): java.lang.String - enclosing method TKt.specializedSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/String; - synthetic final field ;> $f: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$specializedSam$1 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String - inner (anonymous) class TKt$specializedSam$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.txt index 7f470d7752f..7c3aa366fd9 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.txt @@ -1,11 +1,11 @@ @kotlin.Metadata final class<Ljava/lang/Object;LSam;> TKt$specializedSam$1 { // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void + <(Lkotlin/jvm/functions/Function0;)V> method (p0: kotlin.jvm.functions.Function0): void public synthetic bridge method get(): java.lang.Object public final method get(): java.lang.String enclosing method TKt.specializedSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/String; - synthetic final field $f: kotlin.jvm.functions.Function0 + synthetic final field ;> $f: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$specializedSam$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.ir.txt deleted file mode 100644 index 1ca7fd0f17c..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.ir.txt +++ /dev/null @@ -1,52 +0,0 @@ -@kotlin.Metadata -public interface A { - // source: 'nonApproxToValidSupertype.kt' -} - -@kotlin.Metadata -public interface B { - // source: 'nonApproxToValidSupertype.kt' -} - -@kotlin.Metadata -public final class G { - // source: 'nonApproxToValidSupertype.kt' - public method (): void - public final method check(@org.jetbrains.annotations.NotNull p0: IFoo): void -} - -@kotlin.Metadata -public interface IFoo { - // source: 'nonApproxToValidSupertype.kt' - public abstract method accept(@org.jetbrains.annotations.NotNull p0: X): void -} - -@kotlin.Metadata -final class NonApproxToValidSupertypeKt$test$1 { - // source: 'nonApproxToValidSupertype.kt' - enclosing method NonApproxToValidSupertypeKt.test()V - public final static field INSTANCE: NonApproxToValidSupertypeKt$test$1 - inner (anonymous) class NonApproxToValidSupertypeKt$test$1 - static method (): void - method (): void - public synthetic bridge method accept(p0: X): void - public final method accept(p0: java.lang.Object): void -} - -@kotlin.Metadata -public final class NonApproxToValidSupertypeKt { - // source: 'nonApproxToValidSupertype.kt' - inner (anonymous) class NonApproxToValidSupertypeKt$test$1 - public final static method sel(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final static method test(): void -} - -@kotlin.Metadata -public interface X { - // source: 'nonApproxToValidSupertype.kt' -} - -@kotlin.Metadata -public interface Z { - // source: 'nonApproxToValidSupertype.kt' -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.txt b/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.txt index bfd58ea000b..1ca7fd0f17c 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype.txt @@ -29,8 +29,8 @@ final class NonApproxToValidSupertypeKt$test$1 { inner (anonymous) class NonApproxToValidSupertypeKt$test$1 static method (): void method (): void - public final method accept(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void public synthetic bridge method accept(p0: X): void + public final method accept(p0: java.lang.Object): void } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.ir.txt deleted file mode 100644 index 5123e03b437..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.ir.txt +++ /dev/null @@ -1,62 +0,0 @@ -@kotlin.Metadata -public interface A { - // source: 'nonApproxToValidSupertype2.kt' -} - -@kotlin.Metadata -public interface B { - // source: 'nonApproxToValidSupertype2.kt' -} - -@kotlin.Metadata -public final class G { - // source: 'nonApproxToValidSupertype2.kt' - public method (): void - public final method check(@org.jetbrains.annotations.NotNull p0: IFoo): void -} - -@kotlin.Metadata -public interface IFoo { - // source: 'nonApproxToValidSupertype2.kt' - public abstract method accept(@org.jetbrains.annotations.NotNull p0: U): void -} - -@kotlin.Metadata -final class NonApproxToValidSupertype2Kt$test$1 { - // source: 'nonApproxToValidSupertype2.kt' - enclosing method NonApproxToValidSupertype2Kt.test()V - public final static field INSTANCE: NonApproxToValidSupertype2Kt$test$1 - inner (anonymous) class NonApproxToValidSupertype2Kt$test$1 - static method (): void - method (): void - public synthetic bridge method accept(p0: U): void - public final method accept(p0: java.lang.Object): void -} - -@kotlin.Metadata -public final class NonApproxToValidSupertype2Kt { - // source: 'nonApproxToValidSupertype2.kt' - inner (anonymous) class NonApproxToValidSupertype2Kt$test$1 - public final static method sel(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public final static method test(): void -} - -@kotlin.Metadata -public interface U { - // source: 'nonApproxToValidSupertype2.kt' -} - -@kotlin.Metadata -public interface W { - // source: 'nonApproxToValidSupertype2.kt' -} - -@kotlin.Metadata -public interface X { - // source: 'nonApproxToValidSupertype2.kt' -} - -@kotlin.Metadata -public interface Z { - // source: 'nonApproxToValidSupertype2.kt' -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.txt b/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.txt index e5652e7518d..5123e03b437 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/nonApproxToValidSupertype2.txt @@ -29,8 +29,8 @@ final class NonApproxToValidSupertype2Kt$test$1 { inner (anonymous) class NonApproxToValidSupertype2Kt$test$1 static method (): void method (): void - public final method accept(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void public synthetic bridge method accept(p0: U): void + public final method accept(p0: java.lang.Object): void } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.ir.txt deleted file mode 100644 index c4c88b8bdf9..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -@kotlin.Metadata -synthetic final class test/PrivateInlineSamAdapterKt$sam$java_lang_Runnable$0 { - // source: 'privateInlineSamAdapter.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method run(): void - enclosing class test/PrivateInlineSamAdapterKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class test/PrivateInlineSamAdapterKt$sam$java_lang_Runnable$0 -} - -@kotlin.Metadata -final class;> test/PrivateInlineSamAdapterKt$test$lambda$1 { - // source: 'privateInlineSamAdapter.kt' - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void - enclosing method test/PrivateInlineSamAdapterKt.test()V - public final static field INSTANCE: test.PrivateInlineSamAdapterKt$test$lambda$1 - inner (anonymous) class test/PrivateInlineSamAdapterKt$test$lambda$1 -} - -@kotlin.Metadata -public final class test/PrivateInlineSamAdapterKt { - // source: 'privateInlineSamAdapter.kt' - public final static method test(): void - inner (anonymous) class test/PrivateInlineSamAdapterKt$sam$java_lang_Runnable$0 - inner (anonymous) class test/PrivateInlineSamAdapterKt$test$lambda$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.txt b/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.txt index 1603b288484..c4c88b8bdf9 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/privateInlineSamAdapter.txt @@ -3,7 +3,7 @@ synthetic final class test/PrivateInlineSamAdapterKt$sam$java_lang_Runnab // source: 'privateInlineSamAdapter.kt' method (p0: kotlin.jvm.functions.Function0): void public synthetic final method run(): void - enclosing method test/PrivateInlineSamAdapterKt.test()V + enclosing class test/PrivateInlineSamAdapterKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class test/PrivateInlineSamAdapterKt$sam$java_lang_Runnable$0 } @@ -24,5 +24,6 @@ final class test/PrivateInlineSamAdapterKt { // source: 'privateInlineSamAdapter.kt' public final static method test(): void + inner (anonymous) class test/PrivateInlineSamAdapterKt$sam$java_lang_Runnable$0 inner (anonymous) class test/PrivateInlineSamAdapterKt$test$lambda$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.ir.txt deleted file mode 100644 index 380b5621920..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.ir.txt +++ /dev/null @@ -1,51 +0,0 @@ -@kotlin.Metadata -synthetic final class A$sam$java_lang_Runnable$0 { - // source: 'reusedSamWrapperClasses.kt' - enclosing class A - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class A$sam$java_lang_Runnable$0 - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method run(): void -} - -@kotlin.Metadata -final class A$test1$f$1 { - // source: 'reusedSamWrapperClasses.kt' - enclosing method A.test1()V - public final static field INSTANCE: A$test1$f$1 - inner (anonymous) class A$test1$f$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -public final class A { - // source: 'reusedSamWrapperClasses.kt' - inner (anonymous) class A$sam$java_lang_Runnable$0 - inner (anonymous) class A$test1$f$1 - public method (): void - public final method test1(): void -} - -@kotlin.Metadata -final class B$test2$f$1 { - // source: 'reusedSamWrapperClasses.kt' - enclosing method B.test2()V - public final static field INSTANCE: B$test2$f$1 - inner (anonymous) class B$test2$f$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -public final class B { - // source: 'reusedSamWrapperClasses.kt' - inner (anonymous) class A$sam$java_lang_Runnable$0 - inner (anonymous) class B$test2$f$1 - public method (): void - public final method test2(): void -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt index d32cb99aa72..380b5621920 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt @@ -1,7 +1,7 @@ @kotlin.Metadata synthetic final class A$sam$java_lang_Runnable$0 { // source: 'reusedSamWrapperClasses.kt' - enclosing method A.test1()V + enclosing class A private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class A$sam$java_lang_Runnable$0 method (p0: kotlin.jvm.functions.Function0): void @@ -44,6 +44,7 @@ final class B$test2$f$1 { @kotlin.Metadata public final class B { // source: 'reusedSamWrapperClasses.kt' + inner (anonymous) class A$sam$java_lang_Runnable$0 inner (anonymous) class B$test2$f$1 public method (): void public final method test2(): void diff --git a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.ir.txt deleted file mode 100644 index 0d97548945f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -@kotlin.Metadata -public synthetic final class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 { - // source: 'samAdapterAndInlinedOne.kt' - public method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method run(): void - enclosing class test/SamAdapterAndInlinedOneKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 -} - -@kotlin.Metadata -synthetic final class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 { - // source: 'samAdapterAndInlinedOne.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method run(): void - enclosing class test/SamAdapterAndInlinedOneKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 -} - -@kotlin.Metadata -public final class test/SamAdapterAndInlinedOneKt { - // source: 'samAdapterAndInlinedOne.kt' - public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;> method makeRunnable2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable - public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;> method noInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable - public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;> method noInline2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable - public synthetic final static <(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;> method makeRunnable(p0: kotlin.jvm.functions.Function0): java.lang.Runnable - inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 - inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt index 8190a19b22d..0d97548945f 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt @@ -3,7 +3,7 @@ public synthetic final class test/SamAdapterAndInlinedOneKt$sam$i$java_la // source: 'samAdapterAndInlinedOne.kt' public method (p0: kotlin.jvm.functions.Function0): void public synthetic final method run(): void - enclosing method test/SamAdapterAndInlinedOneKt.makeRunnable(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable; + enclosing class test/SamAdapterAndInlinedOneKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 } @@ -13,7 +13,7 @@ synthetic final class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnab // source: 'samAdapterAndInlinedOne.kt' method (p0: kotlin.jvm.functions.Function0): void public synthetic final method run(): void - enclosing method test/SamAdapterAndInlinedOneKt.noInline(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable; + enclosing class test/SamAdapterAndInlinedOneKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.ir.txt deleted file mode 100644 index c921412e745..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -@kotlin.Metadata -synthetic final class test/SamAdapterInInlineLambdaKt$sam$java_lang_Runnable$0 { - // source: 'samAdapterInInlineLambda.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method run(): void - enclosing class test/SamAdapterInInlineLambdaKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class test/SamAdapterInInlineLambdaKt$sam$java_lang_Runnable$0 -} - -@kotlin.Metadata -final class;> test/SamAdapterInInlineLambdaKt$test$lambda$1 { - // source: 'samAdapterInInlineLambda.kt' - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void - enclosing method test/SamAdapterInInlineLambdaKt.test()V - public final static field INSTANCE: test.SamAdapterInInlineLambdaKt$test$lambda$1 - inner (anonymous) class test/SamAdapterInInlineLambdaKt$test$lambda$1 -} - -@kotlin.Metadata -public final class test/SamAdapterInInlineLambdaKt { - // source: 'samAdapterInInlineLambda.kt' - public final static method test(): void - inner (anonymous) class test/SamAdapterInInlineLambdaKt$sam$java_lang_Runnable$0 - inner (anonymous) class test/SamAdapterInInlineLambdaKt$test$lambda$1 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.txt b/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.txt index 14a3f59a29b..c921412e745 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/samAdapterInInlineLambda.txt @@ -3,7 +3,7 @@ synthetic final class test/SamAdapterInInlineLambdaKt$sam$java_lang_Runna // source: 'samAdapterInInlineLambda.kt' method (p0: kotlin.jvm.functions.Function0): void public synthetic final method run(): void - enclosing method test/SamAdapterInInlineLambdaKt.test()V + enclosing class test/SamAdapterInInlineLambdaKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class test/SamAdapterInInlineLambdaKt$sam$java_lang_Runnable$0 } @@ -24,5 +24,6 @@ final class test/SamAdapterInInlineLambdaKt { // source: 'samAdapterInInlineLambda.kt' public final static method test(): void + inner (anonymous) class test/SamAdapterInInlineLambdaKt$sam$java_lang_Runnable$0 inner (anonymous) class test/SamAdapterInInlineLambdaKt$test$lambda$1 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.ir.txt deleted file mode 100644 index 15f315811dc..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -@kotlin.Metadata -public final class C$Companion { - // source: 'test.kt' - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - private synthetic final static method x1$_init___proxy(): C - public final method x1(): void - private synthetic final static method x2$_init___proxy$0(): C - public final method x2(): void - public final inner class C$Companion -} - -@kotlin.Metadata -public final class C { - // source: 'test.kt' - public final static @org.jetbrains.annotations.NotNull field Companion: C$Companion - static method (): void - private method (): void - public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void - public final inner class C$Companion -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.txt b/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.txt index 8f5032d2e59..15f315811dc 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit.txt @@ -1,52 +1,15 @@ -@kotlin.Metadata -synthetic final class C$Companion$x1$1 { - // source: 'test.kt' - enclosing method C$Companion.x1()V - public final static field INSTANCE: C$Companion$x1$1 - inner (anonymous) class C$Companion$x1$1 - static method (): void - method (): void - public final @org.jetbrains.annotations.NotNull method invoke(): C - public synthetic bridge method invoke(): java.lang.Object - public final inner class C$Companion -} - -@kotlin.Metadata -synthetic final class C$Companion$x2$1 { - // source: 'test.kt' - enclosing method C$Companion.x2()V - public final static field INSTANCE: C$Companion$x2$1 - inner (anonymous) class C$Companion$x2$1 - static method (): void - method (): void - public final @org.jetbrains.annotations.NotNull method invoke(): C - public synthetic bridge method invoke(): java.lang.Object - public final inner class C$Companion -} - @kotlin.Metadata public final class C$Companion { // source: 'test.kt' - inner (anonymous) class C$Companion$x1$1 - inner (anonymous) class C$Companion$x2$1 - inner (anonymous) class C$sam$java_util_function_Supplier$0 private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void + private synthetic final static method x1$_init___proxy(): C public final method x1(): void + private synthetic final static method x2$_init___proxy$0(): C public final method x2(): void public final inner class C$Companion } -@kotlin.Metadata -synthetic final class C$sam$java_util_function_Supplier$0 { - // source: 'test.kt' - enclosing method C$Companion.x1()V - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class C$sam$java_util_function_Supplier$0 - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method get(): java.lang.Object -} - @kotlin.Metadata public final class C { // source: 'test.kt' diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.ir.txt deleted file mode 100644 index 5ac07a34f51..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -@kotlin.Metadata -public interface<Ljava/lang/Object;> Sam { - // source: 't.kt' - public abstract <()TT;> method get(): java.lang.Object -} - -@kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - public final @org.jetbrains.annotations.NotNull <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function - method (p0: kotlin.jvm.functions.Function0): void - public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public synthetic final method get(): java.lang.Object - public final method hashCode(): int - enclosing class TKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String - public final static <(LSam;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object - inner (anonymous) class TKt$sam$Sam$0 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt index 81a5be6df37..5ac07a34f51 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt @@ -7,12 +7,12 @@ public interface<Ljava/lang/Object;> Sam { @kotlin.Metadata synthetic final class TKt$sam$Sam$0 { // source: 't.kt' + public final @org.jetbrains.annotations.NotNull <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function method (p0: kotlin.jvm.functions.Function0): void - public method equals(p0: java.lang.Object): boolean + public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public synthetic final method get(): java.lang.Object - public method getFunctionDelegate(): kotlin.Function - public method hashCode(): int - enclosing method TKt.specializedSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/String; + public final method hashCode(): int + enclosing class TKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$sam$Sam$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.ir.txt deleted file mode 100644 index 1f0916f8e52..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.ir.txt +++ /dev/null @@ -1,16 +0,0 @@ -@kotlin.Metadata -synthetic final class TKt$sam$Sam$0 { - // source: 't.kt' - method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method get(): java.lang.Object - enclosing class TKt - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class TKt$sam$Sam$0 -} - -@kotlin.Metadata -public final class TKt { - // source: 't.kt' - public final static <(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String - inner (anonymous) class TKt$sam$Sam$0 -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt index f5d8756817e..1f0916f8e52 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt @@ -3,7 +3,7 @@ synthetic final class TKt$sam$Sam$0 { // source: 't.kt' method (p0: kotlin.jvm.functions.Function0): void public synthetic final method get(): java.lang.Object - enclosing method TKt.specializedSam(Lkotlin/jvm/functions/Function0;)Ljava/lang/String; + enclosing class TKt private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class TKt$sam$Sam$0 } diff --git a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.ir.txt b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.ir.txt deleted file mode 100644 index a3cd023104b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.ir.txt +++ /dev/null @@ -1,81 +0,0 @@ -@kotlin.Metadata -final class A$testRunnableSamCtor1$1 { - // source: 'wrapperInlinedFromAnotherClass.kt' - enclosing method A.testRunnableSamCtor1()Ljava/lang/Runnable; - public final static field INSTANCE: A$testRunnableSamCtor1$1 - inner (anonymous) class A$testRunnableSamCtor1$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -final class A$testRunnableSamCtor2$1 { - // source: 'wrapperInlinedFromAnotherClass.kt' - enclosing method A.testRunnableSamCtor2()Ljava/lang/Runnable; - public final static field INSTANCE: A$testRunnableSamCtor2$1 - inner (anonymous) class A$testRunnableSamCtor2$1 - static method (): void - method (): void - public synthetic bridge method invoke(): java.lang.Object - public final method invoke(): void -} - -@kotlin.Metadata -public final class A { - // source: 'wrapperInlinedFromAnotherClass.kt' - inner (anonymous) class A$testRunnableSamCtor1$1 - inner (anonymous) class A$testRunnableSamCtor2$1 - public method (): void - public final @org.jetbrains.annotations.NotNull method test1a(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method test1b(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method test2a(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method test2b(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method testRunnableSamCtor1(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method testRunnableSamCtor2(): java.lang.Runnable -} - -@kotlin.Metadata -public final class B$runnable1$1 { - // source: 'wrapperInlinedFromAnotherClass.kt' - enclosing method B.runnable1()Ljava/lang/Runnable; - public final static field INSTANCE: B$runnable1$1 - inner (anonymous) class B$runnable1$1 - static method (): void - public method (): void - public final method run(): void -} - -@kotlin.Metadata -public final class B$runnable2$1 { - // source: 'wrapperInlinedFromAnotherClass.kt' - enclosing method B.runnable2()Ljava/lang/Runnable; - public final static field INSTANCE: B$runnable2$1 - inner (anonymous) class B$runnable2$1 - static method (): void - public method (): void - public final method run(): void -} - -@kotlin.Metadata -public synthetic final class B$sam$i$java_lang_Runnable$0 { - // source: 'wrapperInlinedFromAnotherClass.kt' - enclosing class B - private synthetic final field function: kotlin.jvm.functions.Function0 - inner (anonymous) class B$sam$i$java_lang_Runnable$0 - public method (p0: kotlin.jvm.functions.Function0): void - public synthetic final method run(): void -} - -@kotlin.Metadata -public final class B { - // source: 'wrapperInlinedFromAnotherClass.kt' - inner (anonymous) class B$runnable1$1 - inner (anonymous) class B$runnable2$1 - inner (anonymous) class B$sam$i$java_lang_Runnable$0 - public method (): void - public final @org.jetbrains.annotations.NotNull method runnable1(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method runnable2(): java.lang.Runnable - public final @org.jetbrains.annotations.NotNull method runnableSamCtor(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable -} diff --git a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt index 64102a8aa4b..a3cd023104b 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt @@ -61,7 +61,7 @@ public final class B$runnable2$1 { @kotlin.Metadata public synthetic final class B$sam$i$java_lang_Runnable$0 { // source: 'wrapperInlinedFromAnotherClass.kt' - enclosing method B.runnableSamCtor(Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable; + enclosing class B private synthetic final field function: kotlin.jvm.functions.Function0 inner (anonymous) class B$sam$i$java_lang_Runnable$0 public method (p0: kotlin.jvm.functions.Function0): void @@ -73,6 +73,7 @@ public final class B { // source: 'wrapperInlinedFromAnotherClass.kt' inner (anonymous) class B$runnable1$1 inner (anonymous) class B$runnable2$1 + inner (anonymous) class B$sam$i$java_lang_Runnable$0 public method (): void public final @org.jetbrains.annotations.NotNull method runnable1(): java.lang.Runnable public final @org.jetbrains.annotations.NotNull method runnable2(): java.lang.Runnable diff --git a/compiler/testData/codegen/bytecodeListing/sealed/permittedSubclasses_1_7.kt b/compiler/testData/codegen/bytecodeListing/sealed/permittedSubclasses_1_7.kt index 78c0a0489f5..d00d3d04c38 100644 --- a/compiler/testData/codegen/bytecodeListing/sealed/permittedSubclasses_1_7.kt +++ b/compiler/testData/codegen/bytecodeListing/sealed/permittedSubclasses_1_7.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM // IGNORE_DEXING // JVM_TARGET: 17 // !LANGUAGE: +JvmPermittedSubclassesAttributeForSealed @@ -23,4 +22,4 @@ sealed class BinaryExpr(val arg1: Expr, val arg2: Expr) : Expr class BinaryPlusExpr(arg1: Expr, arg2: Expr) : BinaryExpr(arg1, arg2) class BinaryMinusExpr(arg1: Expr, arg2: Expr) : BinaryExpr(arg1, arg2) class BinaryMulExpr(arg1: Expr, arg2: Expr) : BinaryExpr(arg1, arg2) -class BinaryDivExpr(arg1: Expr, arg2: Expr) : BinaryExpr(arg1, arg2) \ No newline at end of file +class BinaryDivExpr(arg1: Expr, arg2: Expr) : BinaryExpr(arg1, arg2) diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.ir.txt deleted file mode 100644 index 7cfbb465f59..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.ir.txt +++ /dev/null @@ -1,130 +0,0 @@ -@kotlin.Metadata -public abstract class ACA { - // source: 'abstractCollections.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ACAN { - // source: 'abstractCollections.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ACI { - // source: 'abstractCollections.kt' - public method (): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ACIN { - // source: 'abstractCollections.kt' - public method (): void - public method add(p0: java.lang.Integer): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: java.lang.Integer): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ACS { - // source: 'abstractCollections.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ACSN { - // source: 'abstractCollections.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ACT { - // source: 'abstractCollections.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.txt index 298b34aab1a..7cfbb465f59 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.txt @@ -5,7 +5,6 @@ public abstract class ACA { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean @@ -23,7 +22,6 @@ public abstract class ACAN { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean @@ -39,7 +37,7 @@ public abstract class ACI { // source: 'abstractCollections.kt' public method (): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public abstract method contains(p0: int): boolean @@ -59,7 +57,7 @@ public abstract class ACIN { // source: 'abstractCollections.kt' public method (): void public method add(p0: java.lang.Integer): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public abstract method contains(p0: java.lang.Integer): boolean @@ -78,7 +76,7 @@ public abstract class ACIN { public abstract class ACS { // source: 'abstractCollections.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -98,7 +96,7 @@ public abstract class ACS { public abstract class ACSN { // source: 'abstractCollections.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -121,7 +119,6 @@ public abstract class ACT { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.ir.txt deleted file mode 100644 index f1d6fb4f28b..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.ir.txt +++ /dev/null @@ -1,200 +0,0 @@ -@kotlin.Metadata -public abstract class ALA { - // source: 'abstractLists.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ALAN { - // source: 'abstractLists.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ALI { - // source: 'abstractLists.kt' - public method (): void - public method add(p0: int): boolean - public method add(p0: int, p1: int): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method indexOf(p0: int): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: int): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): int - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: int): java.lang.Integer - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ALIN { - // source: 'abstractLists.kt' - public method (): void - public method add(p0: int, p1: java.lang.Integer): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Integer): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: java.lang.Integer): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Integer): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Integer): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Integer - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Integer): java.lang.Integer - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ALS { - // source: 'abstractLists.kt' - public method (): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.String): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.String): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.String - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.String): java.lang.String - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ALSN { - // source: 'abstractLists.kt' - public method (): void - public synthetic bridge method add(p0: int, p1: java.lang.Object): void - public method add(p0: int, p1: java.lang.String): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.String): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public synthetic bridge method remove(p0: int): java.lang.Object - public method remove(p0: int): java.lang.String - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object - public method set(p0: int, p1: java.lang.String): java.lang.String - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ALT { - // source: 'abstractLists.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.txt index c3ddcd6c942..f1d6fb4f28b 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.txt @@ -7,10 +7,7 @@ public abstract class ALA { public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Object @@ -33,10 +30,7 @@ public abstract class ALAN { public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Object @@ -56,8 +50,8 @@ public abstract class ALI { public method (): void public method add(p0: int): boolean public method add(p0: int, p1: int): void - public synthetic method add(p0: int, p1: java.lang.Object): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -71,12 +65,12 @@ public abstract class ALI { public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): int - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public method set(p0: int, p1: int): java.lang.Integer - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public bridge final method size(): int public method subList(p0: int, p1: int): java.util.List public method toArray(): java.lang.Object[] @@ -88,9 +82,9 @@ public abstract class ALIN { // source: 'abstractLists.kt' public method (): void public method add(p0: int, p1: java.lang.Integer): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: java.lang.Integer): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -104,12 +98,12 @@ public abstract class ALIN { public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Integer - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean public method set(p0: int, p1: java.lang.Integer): java.lang.Integer - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public bridge final method size(): int public method subList(p0: int, p1: int): java.util.List public method toArray(): java.lang.Object[] @@ -120,9 +114,9 @@ public abstract class ALIN { public abstract class ALS { // source: 'abstractLists.kt' public method (): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.String): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean @@ -136,12 +130,12 @@ public abstract class ALS { public abstract method lastIndexOf(p0: java.lang.String): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.String public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.String): java.lang.String public bridge final method size(): int public method subList(p0: int, p1: int): java.util.List @@ -153,9 +147,9 @@ public abstract class ALS { public abstract class ALSN { // source: 'abstractLists.kt' public method (): void - public synthetic method add(p0: int, p1: java.lang.Object): void + public synthetic bridge method add(p0: int, p1: java.lang.Object): void public method add(p0: int, p1: java.lang.String): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean @@ -169,12 +163,12 @@ public abstract class ALSN { public abstract method lastIndexOf(p0: java.lang.String): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator - public synthetic method remove(p0: int): java.lang.Object + public synthetic bridge method remove(p0: int): java.lang.Object public method remove(p0: int): java.lang.String public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public synthetic method set(p0: int, p1: java.lang.Object): java.lang.Object + public synthetic bridge method set(p0: int, p1: java.lang.Object): java.lang.Object public method set(p0: int, p1: java.lang.String): java.lang.String public bridge final method size(): int public method subList(p0: int, p1: int): java.util.List @@ -191,10 +185,7 @@ public abstract class ALT { public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.ir.txt deleted file mode 100644 index eaafa58fc71..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.ir.txt +++ /dev/null @@ -1,119 +0,0 @@ -@kotlin.Metadata -public abstract class AMLA { - // source: 'abstractMutableLists.kt' - public method (): void - public abstract method getSize(): int - public bridge final method remove(p0: int): java.lang.Object - public abstract method removeAt(p0: int): java.lang.Object - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AMLAN { - // source: 'abstractMutableLists.kt' - public method (): void - public abstract method getSize(): int - public bridge final method remove(p0: int): java.lang.Object - public abstract method removeAt(p0: int): java.lang.Object - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AMLI { - // source: 'abstractMutableLists.kt' - public method (): void - public abstract method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method indexOf(p0: int): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: int): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge final method remove(p0: int): int - public synthetic bridge method remove(p0: int): java.lang.Object - public abstract method remove(p0: java.lang.Integer): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method removeAt(p0: int): java.lang.Integer - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AMLIN { - // source: 'abstractMutableLists.kt' - public method (): void - public abstract method contains(p0: java.lang.Integer): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Integer): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Integer): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge final method remove(p0: int): java.lang.Integer - public synthetic bridge method remove(p0: int): java.lang.Object - public abstract method remove(p0: java.lang.Integer): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method removeAt(p0: int): java.lang.Integer - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AMLS { - // source: 'abstractMutableLists.kt' - public method (): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.String): int - public synthetic bridge method remove(p0: int): java.lang.Object - public bridge final method remove(p0: int): java.lang.String - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method remove(p0: java.lang.String): boolean - public abstract method removeAt(p0: int): java.lang.String - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AMLSN { - // source: 'abstractMutableLists.kt' - public method (): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public abstract method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.String): int - public synthetic bridge method remove(p0: int): java.lang.Object - public bridge final method remove(p0: int): java.lang.String - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method remove(p0: java.lang.String): boolean - public abstract method removeAt(p0: int): java.lang.String - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AMLT { - // source: 'abstractMutableLists.kt' - public method (): void - public abstract method getSize(): int - public bridge final method remove(p0: int): java.lang.Object - public abstract method removeAt(p0: int): java.lang.Object - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.txt index 482b9416bfd..eaafa58fc71 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.txt @@ -2,12 +2,8 @@ public abstract class AMLA { // source: 'abstractMutableLists.kt' public method (): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public bridge final method remove(p0: int): java.lang.Object - public abstract method remove(p0: java.lang.Object): boolean public abstract method removeAt(p0: int): java.lang.Object public bridge final method size(): int public method toArray(): java.lang.Object[] @@ -18,12 +14,8 @@ public abstract class AMLA { public abstract class AMLAN { // source: 'abstractMutableLists.kt' public method (): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public bridge final method remove(p0: int): java.lang.Object - public abstract method remove(p0: java.lang.Object): boolean public abstract method removeAt(p0: int): java.lang.Object public bridge final method size(): int public method toArray(): java.lang.Object[] @@ -118,12 +110,8 @@ public abstract class AMLSN { public abstract class AMLT { // source: 'abstractMutableLists.kt' public method (): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public bridge final method remove(p0: int): java.lang.Object - public abstract method remove(p0: java.lang.Object): boolean public abstract method removeAt(p0: int): java.lang.Object public bridge final method size(): int public method toArray(): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.ir.txt deleted file mode 100644 index a884b27fe10..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.ir.txt +++ /dev/null @@ -1,130 +0,0 @@ -@kotlin.Metadata -public abstract class ASA { - // source: 'abstractSets.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ASAN { - // source: 'abstractSets.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ASI { - // source: 'abstractSets.kt' - public method (): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ASIN { - // source: 'abstractSets.kt' - public method (): void - public method add(p0: java.lang.Integer): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method contains(p0: java.lang.Integer): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ASS { - // source: 'abstractSets.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class ASSN { - // source: 'abstractSets.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class AST { - // source: 'abstractSets.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.txt index d996f8e29c1..a884b27fe10 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.txt @@ -5,7 +5,6 @@ public abstract class ASA { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean @@ -23,7 +22,6 @@ public abstract class ASAN { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean @@ -39,7 +37,7 @@ public abstract class ASI { // source: 'abstractSets.kt' public method (): void public method add(p0: int): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public abstract method contains(p0: int): boolean @@ -59,7 +57,7 @@ public abstract class ASIN { // source: 'abstractSets.kt' public method (): void public method add(p0: java.lang.Integer): boolean - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void public abstract method contains(p0: java.lang.Integer): boolean @@ -78,7 +76,7 @@ public abstract class ASIN { public abstract class ASS { // source: 'abstractSets.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -98,7 +96,7 @@ public abstract class ASS { public abstract class ASSN { // source: 'abstractSets.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void @@ -121,7 +119,6 @@ public abstract class AST { public method add(p0: java.lang.Object): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int public method iterator(): java.util.Iterator public method remove(p0: java.lang.Object): boolean diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/contains.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/contains.ir.txt deleted file mode 100644 index 6e7f671ff1f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/contains.ir.txt +++ /dev/null @@ -1,142 +0,0 @@ -@kotlin.Metadata -public abstract class A1 { - // source: 'contains.kt' - public method (): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public abstract method getSize(): int - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class A2 { - // source: 'contains.kt' - public method (): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public abstract method getSize(): int - public bridge final method remove(p0: java.lang.Object): boolean - public abstract method remove(p0: java.lang.String): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class A3 { - // source: 'contains.kt' - public method (): void - public abstract method getSize(): int - public bridge final method remove(p0: int): java.lang.Object - public bridge method removeAt(p0: int): java.lang.Object - public bridge final method size(): int -} - -@kotlin.Metadata -public abstract class A4 { - // source: 'contains.kt' - public method (): void - public method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public abstract method getSize(): int - public bridge final method remove(p0: int): java.lang.Object - public bridge method removeAt(p0: int): java.lang.Object - public bridge final method size(): int -} - -@kotlin.Metadata -public abstract class A5 { - // source: 'contains.kt' - public method (): void - public bridge final method contains(p0: java.lang.Object): boolean - public bridge method contains(p0: java.lang.String): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public bridge method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge method lastIndexOf(p0: java.lang.String): int - public bridge final method remove(p0: int): java.lang.String - public bridge final method remove(p0: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): boolean - public bridge method removeAt(p0: int): java.lang.String - public bridge final method size(): int -} - -@kotlin.Metadata -public abstract class A6 { - // source: 'contains.kt' - public method (): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public abstract method getSize(): int - public bridge final method indexOf(p0: java.lang.Object): int - public bridge method indexOf(p0: java.lang.String): int - public bridge final method lastIndexOf(p0: java.lang.Object): int - public bridge method lastIndexOf(p0: java.lang.String): int - public bridge final method remove(p0: int): java.lang.String - public bridge final method remove(p0: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): boolean - public bridge method removeAt(p0: int): java.lang.String - public bridge final method size(): int -} - -@kotlin.Metadata -public abstract class A7 { - // source: 'contains.kt' - public method (): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public abstract method getSize(): int - public abstract method remove(p0: java.lang.Integer): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class A8 { - // source: 'contains.kt' - public method (): void - public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean - public abstract method getSize(): int - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class I1$DefaultImpls { - // source: 'contains.kt' - public static method contains(@org.jetbrains.annotations.NotNull p0: I1, p1: java.lang.Object): boolean - public static method containsAll(@org.jetbrains.annotations.NotNull p0: I1, @org.jetbrains.annotations.NotNull p1: java.util.Collection): boolean - public final inner class I1$DefaultImpls -} - -@kotlin.Metadata -public interface I1 { - // source: 'contains.kt' - public abstract method contains(p0: java.lang.Object): boolean - public abstract method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public final inner class I1$DefaultImpls -} - -@kotlin.Metadata -public final class I2$DefaultImpls { - // source: 'contains.kt' - public static method contains(@org.jetbrains.annotations.NotNull p0: I2, @org.jetbrains.annotations.NotNull p1: java.lang.String): boolean - public static method containsAll(@org.jetbrains.annotations.NotNull p0: I2, @org.jetbrains.annotations.NotNull p1: java.util.Collection): boolean - public final inner class I2$DefaultImpls -} - -@kotlin.Metadata -public interface I2 { - // source: 'contains.kt' - public abstract method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public abstract method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public final inner class I2$DefaultImpls -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt index cd79408ffe4..6e7f671ff1f 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/contains.txt @@ -5,7 +5,6 @@ public abstract class A1 { public method contains(p0: java.lang.Object): boolean public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean public abstract method getSize(): int - public abstract method remove(p0: java.lang.Object): boolean public bridge final method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] @@ -105,7 +104,6 @@ public abstract class A8 { public method (): void public method contains(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method remove(p0: java.lang.Object): boolean public bridge final method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.ir.txt deleted file mode 100644 index c38a588a1ab..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -@kotlin.Metadata -public class A { - // source: 'kt41123.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public bridge method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge method remove(p0: java.lang.String): java.lang.String - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class B { - // source: 'kt41123.kt' - public method (): void -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.txt index f6b9d341d12..c38a588a1ab 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/kt41123.txt @@ -7,17 +7,20 @@ public class A { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public bridge method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge method remove(p0: java.lang.String): java.lang.String public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.ir.txt deleted file mode 100644 index 152006ba595..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.ir.txt +++ /dev/null @@ -1,246 +0,0 @@ -@kotlin.Metadata -public interface GM { - // source: 'kt48945.kt' -} - -@kotlin.Metadata -public interface MSS { - // source: 'kt48945.kt' -} - -@kotlin.Metadata -public interface SMSS { - // source: 'kt48945.kt' -} - -@kotlin.Metadata -public final class Test_GMStringString_AbstractMapStringString { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_GMStringString_JMapFinalRemove { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_MSS_AbstractMapStringString { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_MSS_JMapFinalRemove { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_MapStringString_AbstractMapStringString { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_MapStringString_JMapFinalRemove { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_SMSS_AbstractMapStringString { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class Test_SMSS_JMapFinalRemove { - // source: 'kt48945.kt' - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge method containsValue(p0: java.lang.String): boolean - public bridge final method entrySet(): java.util.Set - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public bridge method get(p0: java.lang.String): java.lang.String - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String - public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String - public bridge method getSize(): int - public bridge method getValues(): java.util.Collection - public bridge final method keySet(): java.util.Set - public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.txt index c800a29405c..152006ba595 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.txt @@ -22,19 +22,25 @@ public final class Test_GMStringString_AbstractMapStringString { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -46,19 +52,23 @@ public final class Test_GMStringString_JMapFinalRemove { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -70,19 +80,25 @@ public final class Test_MSS_AbstractMapStringString { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -94,19 +110,23 @@ public final class Test_MSS_JMapFinalRemove { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -118,19 +138,25 @@ public final class Test_MapStringString_AbstractMapStringString { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -142,19 +168,23 @@ public final class Test_MapStringString_JMapFinalRemove { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -166,19 +196,25 @@ public final class Test_SMSS_AbstractMapStringString { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -190,17 +226,21 @@ public final class Test_SMSS_JMapFinalRemove { public bridge final method containsValue(p0: java.lang.Object): boolean public bridge method containsValue(p0: java.lang.String): boolean public bridge final method entrySet(): java.util.Set - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public bridge method get(p0: java.lang.String): java.lang.String public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set public bridge method getKeys(): java.util.Set + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.String): java.lang.String + public bridge method getOrDefault(p0: java.lang.String, p1: java.lang.String): java.lang.String public bridge method getSize(): int public bridge method getValues(): java.util.Collection public bridge final method keySet(): java.util.Set - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge method remove(p0: java.lang.Object): java.lang.Object public bridge final method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public bridge method remove(p0: java.lang.String): java.lang.String public bridge method remove(p0: java.lang.String, p1: java.lang.String): boolean public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.ir.txt deleted file mode 100644 index 5a1960203d4..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.ir.txt +++ /dev/null @@ -1,47 +0,0 @@ -@kotlin.Metadata -public final class IntMutableCollection { - // source: 'mutableCollectionOfPrimitive.kt' - private final @org.jetbrains.annotations.NotNull field mc: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public method add(p0: int): boolean - public synthetic bridge method add(p0: java.lang.Object): boolean - public method addAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method clear(): void - public method contains(p0: int): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): boolean - public bridge final method remove(p0: java.lang.Object): boolean - public method removeAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method retainAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public final class LongMutableCollection { - // source: 'mutableCollectionOfPrimitive.kt' - private final @org.jetbrains.annotations.NotNull field mc: java.util.Collection - public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: long): boolean - public method addAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method clear(): void - public bridge final method contains(p0: java.lang.Object): boolean - public method contains(p0: long): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public bridge final method remove(p0: java.lang.Object): boolean - public method remove(p0: long): boolean - public method removeAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method retainAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.txt index 550844cf249..5a1960203d4 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/mutableCollectionOfPrimitive.txt @@ -1,7 +1,7 @@ @kotlin.Metadata public final class IntMutableCollection { // source: 'mutableCollectionOfPrimitive.kt' - private final field mc: java.util.Collection + private final @org.jetbrains.annotations.NotNull field mc: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void public method add(p0: int): boolean public synthetic bridge method add(p0: java.lang.Object): boolean @@ -13,7 +13,7 @@ public final class IntMutableCollection { public method getSize(): int public method isEmpty(): boolean public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(@org.jetbrains.annotations.NotNull p0: java.lang.Integer): boolean + public method remove(@org.jetbrains.annotations.Nullable p0: java.lang.Integer): boolean public bridge final method remove(p0: java.lang.Object): boolean public method removeAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean public method retainAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean @@ -25,7 +25,7 @@ public final class IntMutableCollection { @kotlin.Metadata public final class LongMutableCollection { // source: 'mutableCollectionOfPrimitive.kt' - private final field mc: java.util.Collection + private final @org.jetbrains.annotations.NotNull field mc: java.util.Collection public method (@org.jetbrains.annotations.NotNull p0: java.util.Collection): void public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: long): boolean diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.ir.txt deleted file mode 100644 index 62746e1d82a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -@kotlin.Metadata -public abstract class A { - // source: 'noSpecialBridgeIfPresentInSuperClass.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class B { - // source: 'noSpecialBridgeIfPresentInSuperClass.kt' - public method (): void -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.txt index 3933b29b2ea..62746e1d82a 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/noSpecialBridgeIfPresentInSuperClass.txt @@ -7,10 +7,7 @@ public abstract class A { public method addAll(p0: int, p1: java.util.Collection): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void - public abstract method contains(p0: java.lang.Object): boolean public abstract method getSize(): int - public abstract method indexOf(p0: java.lang.Object): int - public abstract method lastIndexOf(p0: java.lang.Object): int public method listIterator(): java.util.ListIterator public method listIterator(p0: int): java.util.ListIterator public method remove(p0: int): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/number.kt b/compiler/testData/codegen/bytecodeListing/specialBridges/number.kt index 91d90028e36..f6560c62ad4 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/number.kt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/number.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND: JVM - abstract class AbstractNumber : Number() class MyNumber : Number() { diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.ir.txt deleted file mode 100644 index 712b39962be..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -@kotlin.Metadata -public class A1 { - // source: 'redundantStubForSize.kt' - private final field size: int - public method (): void - public method getSize(): int -} - -@kotlin.Metadata -public final class A2 { - // source: 'redundantStubForSize.kt' - public method (): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add(p0: java.lang.String): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public method contains(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method contains(p0: java.lang.Object): boolean - public method containsAll(@org.jetbrains.annotations.NotNull p0: java.util.Collection): boolean - public method isEmpty(): boolean - public @org.jetbrains.annotations.NotNull method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.txt index 08e8fa5b442..712b39962be 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/redundantStubForSize.txt @@ -10,7 +10,7 @@ public class A1 { public final class A2 { // source: 'redundantStubForSize.kt' public method (): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add(p0: java.lang.String): boolean public method addAll(p0: java.util.Collection): boolean public method clear(): void diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.ir.txt deleted file mode 100644 index 1b6a41279aa..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.ir.txt +++ /dev/null @@ -1,47 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> AbstractGenericMap { - // source: 'genericClass.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public @org.jetbrains.annotations.Nullable <(Ljava/lang/Object;)TV;> method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TK;+TV;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public @org.jetbrains.annotations.Nullable <(TK;TV;)TV;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method (): void - public method clear(): void - public method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public method getSize(): int - public method isEmpty(): boolean - public bridge final method size(): int - private synthetic final field ;> $$delegate_0: java.util.HashMap - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> GenericMap { - // source: 'genericClass.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public @org.jetbrains.annotations.Nullable <(Ljava/lang/Object;)TV;> method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TK;+TV;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public @org.jetbrains.annotations.Nullable <(TK;TV;)TV;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method (): void - public method clear(): void - public method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public method getSize(): int - public method isEmpty(): boolean - public bridge final method size(): int - private synthetic final field ;> $$delegate_0: java.util.HashMap - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.txt index 0d7c55480e9..1b6a41279aa 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/genericClass.txt @@ -19,6 +19,7 @@ public abstract class<Ljava/lang/Objec public method isEmpty(): boolean public bridge final method size(): int private synthetic final field ;> $$delegate_0: java.util.HashMap + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -42,4 +43,5 @@ public final class<Ljava/lang/Object;L public method isEmpty(): boolean public bridge final method size(): int private synthetic final field ;> $$delegate_0: java.util.HashMap + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.ir.txt deleted file mode 100644 index d69c0d8cd26..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;LJMap;> JMapImpl { - // source: 'implementsJavaMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public method (): void - public method containsKey(p0: java.lang.Object): boolean - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method size(): int - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;LJMapN;> JMapNImpl { - // source: 'implementsJavaMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)TB;> method get(p0: java.lang.Object): java.lang.Object - public bridge final <(Ljava/lang/Object;)TB;> method remove(p0: java.lang.Object): java.lang.Object - public <(TA;)Z> method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.Number): boolean - public method (): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Number): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public abstract method remove(p0: java.lang.Number): java.lang.Object - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.txt index 47e07eaf004..d69c0d8cd26 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMap.txt @@ -6,14 +6,12 @@ public abstract class<Ljava/lang/Objec public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set public method (): void public method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public abstract method remove(p0: java.lang.Object): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -27,7 +25,6 @@ public abstract class<Ljava/lang/Objec public <(TA;)Z> method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.Number): boolean public method (): void public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean public abstract method get(p0: java.lang.Number): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set @@ -35,4 +32,5 @@ public abstract class<Ljava/lang/Objec public abstract method getValues(): java.util.Collection public abstract method remove(p0: java.lang.Number): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.ir.txt deleted file mode 100644 index 32ef5015c3f..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -@kotlin.Metadata -public final class<LJImpl;> MyMap { - // source: 'test.kt' - public bridge <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public method (): void - public bridge method getSize(): int - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.txt index 93d411d00f3..32ef5015c3f 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsJavaMapWithCustomEntries.txt @@ -1,13 +1,14 @@ @kotlin.Metadata public final class<LJImpl;> MyMap { // source: 'test.kt' + public bridge <()Ljava/util/Collection;> method getValues(): java.util.Collection public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection + public bridge <()Ljava/util/Set;> method getKeys(): java.util.Set + public bridge <()Ljava/util/Set;>;> method getEntries(): java.util.Set public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set public method (): void - public bridge method getEntries(): java.util.Set - public bridge method getKeys(): java.util.Set public bridge method getSize(): int - public bridge method getValues(): java.util.Collection public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.ir.txt deleted file mode 100644 index 271c3130f36..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.ir.txt +++ /dev/null @@ -1,72 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> MapImpl { - // source: 'implementsMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public <(Ljava/lang/Object;)TB;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TA;+TB;>;)V> method putAll(p0: java.util.Map): void - public <(TA;TB;)TB;> method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method (): void - public method clear(): void - public method containsKey(p0: java.lang.Object): boolean - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public bridge final method size(): int - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public interface<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> MapN { - // source: 'implementsMap.kt' -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;LMapN;> MapNImpl { - // source: 'implementsMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)TB;> method get(p0: java.lang.Object): java.lang.Object - public <(Ljava/lang/Object;)TB;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TA;+TB;>;)V> method putAll(p0: java.util.Map): void - public <(TA;)Z> method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.Number): boolean - public <(TA;TB;)TB;> method put(p0: java.lang.Number, p1: java.lang.Object): java.lang.Object - public method (): void - public method clear(): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Number): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMappedMarker;> MapSImpl { - // source: 'implementsMap.kt' - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public bridge final <(Ljava/lang/Object;)TB;> method get(p0: java.lang.Object): java.lang.Object - public <(Ljava/lang/Object;)TB;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/lang/String;TB;)TB;> method put(p0: java.lang.String, p1: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+Ljava/lang/String;+TB;>;)V> method putAll(p0: java.util.Map): void - public method (): void - public method clear(): void - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.String): java.lang.Object - public abstract method getEntries(): java.util.Set - public abstract method getKeys(): java.util.Set - public abstract method getSize(): int - public abstract method getValues(): java.util.Collection - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.txt index c33fa923b05..271c3130f36 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsMap.txt @@ -10,13 +10,12 @@ public abstract class<Ljava/lang/Objec public method (): void public method clear(): void public method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean - public abstract method get(p0: java.lang.Object): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection public bridge final method size(): int + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -38,14 +37,14 @@ public abstract class<Ljava/lang/Objec public method (): void public method clear(): void public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean public abstract method get(p0: java.lang.Number): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -62,12 +61,12 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map method clear(): void public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean public bridge final method containsKey(p0: java.lang.Object): boolean - public abstract method containsValue(p0: java.lang.Object): boolean public abstract method get(p0: java.lang.String): java.lang.Object public abstract method getEntries(): java.util.Set public abstract method getKeys(): java.util.Set public abstract method getSize(): int public abstract method getValues(): java.util.Collection - public synthetic method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public bridge final method size(): int + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.ir.txt deleted file mode 100644 index 06afa260a2a..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -@kotlin.Metadata -public final class<;B:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/SortedMap;> SortedMapImpl { - // source: 'implementsSortedMap.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public @org.jetbrains.annotations.NotNull <()Ljava/util/Comparator<-TA;>;> method comparator(): java.util.Comparator - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()TA;> method firstKey(): java.lang.Comparable - public @org.jetbrains.annotations.NotNull <()TA;> method lastKey(): java.lang.Comparable - public bridge final <(Ljava/lang/Object;)TB;> method get(p0: java.lang.Object): java.lang.Object - public bridge final <(Ljava/lang/Object;)TB;> method remove(p0: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+TA;+TB;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public <(Ljava/util/SortedMap;)V> method (@org.jetbrains.annotations.NotNull p0: java.util.SortedMap): void - public @org.jetbrains.annotations.NotNull <(TA;)Ljava/util/SortedMap;> method headMap(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): java.util.SortedMap - public @org.jetbrains.annotations.NotNull <(TA;)Ljava/util/SortedMap;> method tailMap(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): java.util.SortedMap - public @org.jetbrains.annotations.Nullable <(TA;)TB;> method get(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): java.lang.Object - public @org.jetbrains.annotations.Nullable <(TA;)TB;> method remove(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): java.lang.Object - public <(TA;)Z> method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable): boolean - public @org.jetbrains.annotations.NotNull <(TA;TA;)Ljava/util/SortedMap;> method subMap(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable, @org.jetbrains.annotations.NotNull p1: java.lang.Comparable): java.util.SortedMap - public @org.jetbrains.annotations.Nullable <(TA;TB;)TB;> method put(@org.jetbrains.annotations.NotNull p0: java.lang.Comparable, p1: java.lang.Object): java.lang.Object - public method clear(): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public synthetic bridge method firstKey(): java.lang.Object - public method getSize(): int - public synthetic bridge method headMap(p0: java.lang.Object): java.util.SortedMap - public method isEmpty(): boolean - public synthetic bridge method lastKey(): java.lang.Object - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public synthetic bridge method subMap(p0: java.lang.Object, p1: java.lang.Object): java.util.SortedMap - public synthetic bridge method tailMap(p0: java.lang.Object): java.util.SortedMap - private final @org.jetbrains.annotations.NotNull field ;> map: java.util.SortedMap - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.txt index d340ebc7bf2..06afa260a2a 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/implementsSortedMap.txt @@ -33,5 +33,6 @@ public final class<;B:Ljava/lang/Object;>Ljava/la public bridge final method size(): int public synthetic bridge method subMap(p0: java.lang.Object, p1: java.lang.Object): java.util.SortedMap public synthetic bridge method tailMap(p0: java.lang.Object): java.util.SortedMap - private final field ;> map: java.util.SortedMap + private final @org.jetbrains.annotations.NotNull field ;> map: java.util.SortedMap + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.ir.txt deleted file mode 100644 index 3f239ccda79..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.ir.txt +++ /dev/null @@ -1,61 +0,0 @@ -@kotlin.Metadata -public abstract class;Lkotlin/jvm/internal/markers/KMutableMap;> AbstractStringStringMap { - // source: 'nonGenericClass.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public <(Ljava/util/Map<+Ljava/lang/String;+Ljava/lang/String;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method (): void - public method clear(): void - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.Nullable method put(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable method remove(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method size(): int - private synthetic final field ;> $$delegate_0: java.util.HashMap - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class;Lkotlin/jvm/internal/markers/KMutableMap;> StringStringMap { - // source: 'nonGenericClass.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public <(Ljava/util/Map<+Ljava/lang/String;+Ljava/lang/String;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method (): void - public method clear(): void - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge final method get(p0: java.lang.Object): java.lang.String - public method getSize(): int - public method isEmpty(): boolean - public @org.jetbrains.annotations.Nullable method put(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable method remove(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object - public bridge final method remove(p0: java.lang.Object): java.lang.String - public bridge final method size(): int - private synthetic final field ;> $$delegate_0: java.util.HashMap - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.txt index 2494462de95..3f239ccda79 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/nonGenericClass.txt @@ -15,15 +15,18 @@ public abstract class method containsValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public method getSize(): int public method isEmpty(): boolean public @org.jetbrains.annotations.Nullable method put(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.Nullable method remove(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method size(): int private synthetic final field ;> $$delegate_0: java.util.HashMap + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -43,13 +46,16 @@ public final class method containsValue(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean public bridge final method containsValue(p0: java.lang.Object): boolean public @org.jetbrains.annotations.Nullable method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public bridge final method get(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): java.lang.String public method getSize(): int public method isEmpty(): boolean public @org.jetbrains.annotations.Nullable method put(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public @org.jetbrains.annotations.Nullable method remove(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String - public bridge final method remove(p0: java.lang.Object): java.lang.Object + public synthetic bridge final method remove(p0: java.lang.Object): java.lang.Object + public bridge final method remove(p0: java.lang.Object): java.lang.String public bridge final method size(): int private synthetic final field ;> $$delegate_0: java.util.HashMap + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.ir.txt deleted file mode 100644 index 9ea55190f69..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.ir.txt +++ /dev/null @@ -1,55 +0,0 @@ -@kotlin.Metadata -public abstract class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> AbstractStringMap { - // source: 'partiallySpecializedClass.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public bridge final <(Ljava/lang/Object;)TV;> method get(p0: java.lang.Object): java.lang.Object - public bridge final <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/String;)TV;> method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/String;)TV;> method remove(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/String;TV;)TV;> method put(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+Ljava/lang/String;+TV;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method (): void - public method clear(): void - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public method getSize(): int - public method isEmpty(): boolean - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - private synthetic final field ;> $$delegate_0: java.util.HashMap - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public final class<Ljava/lang/Object;Ljava/util/Map;Lkotlin/jvm/internal/markers/KMutableMap;> StringMap { - // source: 'partiallySpecializedClass.kt' - public @org.jetbrains.annotations.NotNull <()Ljava/util/Collection;> method getValues(): java.util.Collection - public bridge final <()Ljava/util/Collection;> method values(): java.util.Collection - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;> method getKeys(): java.util.Set - public bridge final <()Ljava/util/Set;> method keySet(): java.util.Set - public bridge final <()Ljava/util/Set;>;> method entrySet(): java.util.Set - public @org.jetbrains.annotations.NotNull <()Ljava/util/Set;>;> method getEntries(): java.util.Set - public bridge final <(Ljava/lang/Object;)TV;> method get(p0: java.lang.Object): java.lang.Object - public bridge final <(Ljava/lang/Object;)TV;> method remove(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/String;)TV;> method get(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/String;)TV;> method remove(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.Object - public @org.jetbrains.annotations.Nullable <(Ljava/lang/String;TV;)TV;> method put(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: java.lang.Object): java.lang.Object - public <(Ljava/util/Map<+Ljava/lang/String;+TV;>;)V> method putAll(@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method (): void - public method clear(): void - public method containsKey(@org.jetbrains.annotations.NotNull p0: java.lang.String): boolean - public bridge final method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public method getSize(): int - public method isEmpty(): boolean - public synthetic bridge method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - private synthetic final field ;> $$delegate_0: java.util.HashMap - public inner class java/util/Map$Entry -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.txt index 3ba4d9e5aec..9ea55190f69 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/signatures/partiallySpecializedClass.txt @@ -23,6 +23,7 @@ public abstract class<Ljava/lang/Object;Ljava/util/Map method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public bridge final method size(): int private synthetic final field ;> $$delegate_0: java.util.HashMap + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -50,4 +51,5 @@ public final class<Ljava/lang/Object;Ljava/util/Map method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public bridge final method size(): int private synthetic final field ;> $$delegate_0: java.util.HashMap + public inner class java/util/Map$Entry } diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.ir.txt deleted file mode 100644 index 2bbad276f90..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.ir.txt +++ /dev/null @@ -1,71 +0,0 @@ -@kotlin.Metadata -public abstract class AMap1 { - // source: 'specialBridgeForGet.kt' - private final @org.jetbrains.annotations.NotNull field m: java.util.Map - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public method clear(): void - public method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method computeIfAbsent(p0: java.lang.Object, p1: java.util.function.Function): java.lang.Object - public method computeIfPresent(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object - public method containsKey(p0: java.lang.Object): boolean - public method containsValue(p0: java.lang.Object): boolean - public bridge final method entrySet(): java.util.Set - public @org.jetbrains.annotations.Nullable method get(p0: java.lang.Object): java.lang.Object - public @org.jetbrains.annotations.NotNull method getEntries(): java.util.Set - public @org.jetbrains.annotations.NotNull method getKeys(): java.util.Set - public method getSize(): int - public @org.jetbrains.annotations.NotNull method getValues(): java.util.Collection - public method isEmpty(): boolean - public bridge final method keySet(): java.util.Set - public method merge(p0: java.lang.Object, p1: java.lang.Object, p2: java.util.function.BiFunction): java.lang.Object - public method put(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method putAll(p0: java.util.Map): void - public method putIfAbsent(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object): java.lang.Object - public method remove(p0: java.lang.Object, p1: java.lang.Object): boolean - public method replace(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public method replace(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public method replaceAll(p0: java.util.function.BiFunction): void - public bridge final method size(): int - public bridge final method values(): java.util.Collection - public inner class java/util/Map$Entry -} - -@kotlin.Metadata -public abstract class AMap2 { - // source: 'specialBridgeForGet.kt' - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public bridge final method containsKey(p0: java.lang.Object): boolean - public bridge method containsKey(p0: java.lang.String): boolean - public bridge method containsValue(p0: Value2): boolean - public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): Value2 - public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object - public bridge method get(p0: java.lang.String): Value2 - public bridge final method getOrDefault(p0: java.lang.Object, p1: Value2): Value2 - public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object - public bridge method getOrDefault(p0: java.lang.String, p1: Value2): Value2 -} - -@kotlin.Metadata -public final class C { - // source: 'specialBridgeForGet.kt' - private final @org.jetbrains.annotations.NotNull field value: java.lang.String - public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String -} - -@kotlin.Metadata -public final class Map3 { - // source: 'specialBridgeForGet.kt' - public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void - public bridge final method get(p0: java.lang.Object): C - public bridge method get(p0: java.lang.String): C - public bridge final method getOrDefault(p0: java.lang.Object, p1: C): C - public bridge method getOrDefault(p0: java.lang.String, p1: C): C -} - -@kotlin.Metadata -public interface Value2 { - // source: 'specialBridgeForGet.kt' -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.txt index 48fc1773957..2bbad276f90 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.txt @@ -1,7 +1,7 @@ @kotlin.Metadata public abstract class AMap1 { // source: 'specialBridgeForGet.kt' - private final field m: java.util.Map + private final @org.jetbrains.annotations.NotNull field m: java.util.Map public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void public method clear(): void public method compute(p0: java.lang.Object, p1: java.util.function.BiFunction): java.lang.Object @@ -28,6 +28,7 @@ public abstract class AMap1 { public method replaceAll(p0: java.util.function.BiFunction): void public bridge final method size(): int public bridge final method values(): java.util.Collection + public inner class java/util/Map$Entry } @kotlin.Metadata @@ -38,9 +39,11 @@ public abstract class AMap2 { public bridge method containsKey(p0: java.lang.String): boolean public bridge method containsValue(p0: Value2): boolean public bridge final method containsValue(p0: java.lang.Object): boolean - public bridge final method get(p0: java.lang.Object): java.lang.Object + public bridge final method get(p0: java.lang.Object): Value2 + public synthetic bridge final method get(p0: java.lang.Object): java.lang.Object public bridge method get(p0: java.lang.String): Value2 - public bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object + public bridge final method getOrDefault(p0: java.lang.Object, p1: Value2): Value2 + public synthetic bridge final method getOrDefault(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public bridge method getOrDefault(p0: java.lang.String, p1: Value2): Value2 } @@ -56,6 +59,10 @@ public final class C { public final class Map3 { // source: 'specialBridgeForGet.kt' public method (@org.jetbrains.annotations.NotNull p0: java.util.Map): void + public bridge final method get(p0: java.lang.Object): C + public bridge method get(p0: java.lang.String): C + public bridge final method getOrDefault(p0: java.lang.Object, p1: C): C + public bridge method getOrDefault(p0: java.lang.String, p1: C): C } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.ir.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.ir.txt deleted file mode 100644 index e5962c29b60..00000000000 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -public final class UIntArray { - // source: 'unsignedArray.kt' - private final field storage: int[] - private synthetic method (p0: int[]): void - public synthetic bridge method add(p0: java.lang.Object): boolean - public method add-WZ4Q5Ns(p0: int): boolean - public method addAll(p0: java.util.Collection): boolean - public synthetic final static method box-impl(p0: int[]): UIntArray - public method clear(): void - public static method constructor-impl(p0: int[]): int[] - public bridge final method contains(p0: java.lang.Object): boolean - public method contains-WZ4Q5Ns(p0: int): boolean - public static method contains-WZ4Q5Ns(p0: int[], p1: int): boolean - public method containsAll(p0: java.util.Collection): boolean - public static method containsAll-impl(p0: int[], p1: java.util.Collection): boolean - public method equals(p0: java.lang.Object): boolean - public static method equals-impl(p0: int[], p1: java.lang.Object): boolean - public final static method equals-impl0(p0: int[], p1: int[]): boolean - public method getSize(): int - public static method getSize-impl(p0: int[]): int - public synthetic deprecated static method getStorage$annotations(): void - public method hashCode(): int - public static method hashCode-impl(p0: int[]): int - public method isEmpty(): boolean - public static method isEmpty-impl(p0: int[]): boolean - public method iterator(): java.lang.Void - public synthetic bridge method iterator(): java.util.Iterator - public static method iterator-impl(p0: int[]): java.lang.Void - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public synthetic bridge method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] - public method toString(): java.lang.String - public static method toString-impl(p0: int[]): java.lang.String - public synthetic final method unbox-impl(): int[] -} diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.txt b/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.txt index e2fb6af2510..e5962c29b60 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.txt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/unsignedArray.txt @@ -2,7 +2,7 @@ public final class UIntArray { // source: 'unsignedArray.kt' private final field storage: int[] private synthetic method (p0: int[]): void - public synthetic method add(p0: java.lang.Object): boolean + public synthetic bridge method add(p0: java.lang.Object): boolean public method add-WZ4Q5Ns(p0: int): boolean public method addAll(p0: java.util.Collection): boolean public synthetic final static method box-impl(p0: int[]): UIntArray @@ -29,7 +29,7 @@ public final class UIntArray { public method remove(p0: java.lang.Object): boolean public method removeAll(p0: java.util.Collection): boolean public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int + public synthetic bridge method size(): int public method toArray(): java.lang.Object[] public method toArray(p0: java.lang.Object[]): java.lang.Object[] public method toString(): java.lang.String diff --git a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt deleted file mode 100644 index 2cad6a8b741..00000000000 --- a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt +++ /dev/null @@ -1,45 +0,0 @@ -@AllOpen -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class AllOpen { - // source: 'allOpenOnNotClasses.kt' -} - -@AllOpen -@kotlin.Metadata -public final enum class Enum { - // source: 'allOpenOnNotClasses.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: Enum[] - private synthetic final static method $values(): Enum[] - static method (): void - private method (p0: java.lang.String, p1: int): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public static method valueOf(p0: java.lang.String): Enum - public static method values(): Enum[] -} - -@AllOpen -@kotlin.Metadata -public interface Intf { - // source: 'allOpenOnNotClasses.kt' -} - -@kotlin.Metadata -public final class MyClass { - // source: 'allOpenOnNotClasses.kt' - private @AllOpen @org.jetbrains.annotations.NotNull field prop: java.lang.String - public method (): void - public final @AllOpen @org.jetbrains.annotations.NotNull method getProp(): java.lang.String - public final @AllOpen method method(): void - public final @AllOpen method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void -} - -@AllOpen -@kotlin.Metadata -public final class Obj { - // source: 'allOpenOnNotClasses.kt' - public final static @org.jetbrains.annotations.NotNull field INSTANCE: Obj - static method (): void - private method (): void -} diff --git a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.txt index 0209ce55af4..2cad6a8b741 100644 --- a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.txt +++ b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.txt @@ -7,11 +7,14 @@ public annotation class AllOpen { @AllOpen @kotlin.Metadata -public enum class Enum { +public final enum class Enum { // source: 'allOpenOnNotClasses.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: Enum[] + private synthetic final static method $values(): Enum[] static method (): void private method (p0: java.lang.String, p1: int): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Enum public static method values(): Enum[] } diff --git a/plugins/allopen/testData/bytecodeListing/anonymousObject.ir.txt b/plugins/allopen/testData/bytecodeListing/anonymousObject.ir.txt deleted file mode 100644 index a4abaa3636d..00000000000 --- a/plugins/allopen/testData/bytecodeListing/anonymousObject.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class AllOpen { - // source: 'anonymousObject.kt' -} - -@kotlin.Metadata -public final class Test$a$1 { - // source: 'anonymousObject.kt' - enclosing method Test.()V - inner (anonymous) class Test$a$1 - method (): void - public method run(): void -} - -@kotlin.Metadata -public final class Test$b$1 { - // source: 'anonymousObject.kt' - enclosing method Test.b()V - inner (anonymous) class Test$b$1 - method (): void - public method run(): void -} - -@AllOpen -@kotlin.Metadata -public class Test { - // source: 'anonymousObject.kt' - private final @org.jetbrains.annotations.NotNull field a: java.lang.Runnable - inner (anonymous) class Test$a$1 - inner (anonymous) class Test$b$1 - public method (): void - private final static method b$lambda$0(): void - public method b(): void - public @org.jetbrains.annotations.NotNull method getA(): java.lang.Runnable -} diff --git a/plugins/allopen/testData/bytecodeListing/anonymousObject.txt b/plugins/allopen/testData/bytecodeListing/anonymousObject.txt index 01befb6fa36..a4abaa3636d 100644 --- a/plugins/allopen/testData/bytecodeListing/anonymousObject.txt +++ b/plugins/allopen/testData/bytecodeListing/anonymousObject.txt @@ -22,17 +22,6 @@ public final class Test$b$1 { public method run(): void } -@kotlin.Metadata -final class Test$b$2 { - // source: 'anonymousObject.kt' - enclosing method Test.b()V - public final static field INSTANCE: Test$b$2 - inner (anonymous) class Test$b$2 - static method (): void - method (): void - public final method run(): void -} - @AllOpen @kotlin.Metadata public class Test { @@ -40,8 +29,8 @@ public class Test { private final @org.jetbrains.annotations.NotNull field a: java.lang.Runnable inner (anonymous) class Test$a$1 inner (anonymous) class Test$b$1 - inner (anonymous) class Test$b$2 public method (): void + private final static method b$lambda$0(): void public method b(): void public @org.jetbrains.annotations.NotNull method getA(): java.lang.Runnable } diff --git a/plugins/allopen/testData/bytecodeListing/privateMembers.ir.txt b/plugins/allopen/testData/bytecodeListing/privateMembers.ir.txt deleted file mode 100644 index afa8ded2827..00000000000 --- a/plugins/allopen/testData/bytecodeListing/privateMembers.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class AllOpen { - // source: 'privateMembers.kt' -} - -@AllOpen -@kotlin.Metadata -class Test { - // source: 'privateMembers.kt' - private final @org.jetbrains.annotations.NotNull field internalProp: java.lang.String - private final @org.jetbrains.annotations.NotNull field privateProp: java.lang.String - private final @org.jetbrains.annotations.NotNull field protectedProp: java.lang.String - private final @org.jetbrains.annotations.NotNull field publicProp: java.lang.String - public method (): void - public @org.jetbrains.annotations.NotNull method getInternalProp$main(): java.lang.String - protected @org.jetbrains.annotations.NotNull method getProtectedProp(): java.lang.String - public @org.jetbrains.annotations.NotNull method getPublicProp(): java.lang.String - public method internalMethod$main(): void - private method privateMethod(): void - private method privateTailrecMethod(): void - protected method protectedMethod(): void - public method publicMethod(): void -} diff --git a/plugins/allopen/testData/bytecodeListing/privateMembers.txt b/plugins/allopen/testData/bytecodeListing/privateMembers.txt index bce4133f073..afa8ded2827 100644 --- a/plugins/allopen/testData/bytecodeListing/privateMembers.txt +++ b/plugins/allopen/testData/bytecodeListing/privateMembers.txt @@ -9,7 +9,7 @@ public annotation class AllOpen { class Test { // source: 'privateMembers.kt' private final @org.jetbrains.annotations.NotNull field internalProp: java.lang.String - private final field privateProp: java.lang.String + private final @org.jetbrains.annotations.NotNull field privateProp: java.lang.String private final @org.jetbrains.annotations.NotNull field protectedProp: java.lang.String private final @org.jetbrains.annotations.NotNull field publicProp: java.lang.String public method (): void diff --git a/plugins/allopen/testData/bytecodeListing/superClassAnnotation.ir.txt b/plugins/allopen/testData/bytecodeListing/superClassAnnotation.ir.txt deleted file mode 100644 index 3fd31d1aa22..00000000000 --- a/plugins/allopen/testData/bytecodeListing/superClassAnnotation.ir.txt +++ /dev/null @@ -1,60 +0,0 @@ -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class AllOpen { - // source: 'superClassAnnotation.kt' -} - -@kotlin.Metadata -public class BaseImpl { - // source: 'superClassAnnotation.kt' - public method (): void - public method baseImplMethod_ShouldBeOpen(): void -} - -@kotlin.Metadata -public class BaseImpl2_ShouldBeOpen { - // source: 'superClassAnnotation.kt' - private final @org.jetbrains.annotations.NotNull field baseImpl2Property_ShouldBeOpen: java.lang.String - public method (): void - public method baseImpl2Method_ShouldBeOpen(): void - public @org.jetbrains.annotations.NotNull method getBaseImpl2Property_ShouldBeOpen(): java.lang.String -} - -@AllOpen -@kotlin.Metadata -public abstract class Base_ShouldBeOpen { - // source: 'superClassAnnotation.kt' - public method (): void - public method baseMethod(): void -} - -@kotlin.Metadata -public final class Intf$DefaultImpls { - // source: 'superClassAnnotation.kt' - public static method intfMethod(@org.jetbrains.annotations.NotNull p0: Intf): void - public final inner class Intf$DefaultImpls -} - -@AllOpen -@kotlin.Metadata -public interface Intf { - // source: 'superClassAnnotation.kt' - public abstract method intfMethod(): void - public final inner class Intf$DefaultImpls -} - -@kotlin.Metadata -public class IntfImpl { - // source: 'superClassAnnotation.kt' - public method (): void - public method intfImplMethod_ShouldBeOpen(): void - public method intfMethod(): void - public final inner class Intf$DefaultImpls -} - -@kotlin.Metadata -public class IntfImpl2_ShouldBeOpen { - // source: 'superClassAnnotation.kt' - public method (): void - public method intfImpl2Method_ShouldBeOpen(): void -} diff --git a/plugins/allopen/testData/bytecodeListing/superClassAnnotation.txt b/plugins/allopen/testData/bytecodeListing/superClassAnnotation.txt index ded1ba7997d..3fd31d1aa22 100644 --- a/plugins/allopen/testData/bytecodeListing/superClassAnnotation.txt +++ b/plugins/allopen/testData/bytecodeListing/superClassAnnotation.txt @@ -49,6 +49,7 @@ public class IntfImpl { public method (): void public method intfImplMethod_ShouldBeOpen(): void public method intfMethod(): void + public final inner class Intf$DefaultImpls } @kotlin.Metadata diff --git a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt deleted file mode 100644 index 8571b6db8e1..00000000000 --- a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt +++ /dev/null @@ -1,47 +0,0 @@ -@NoArg -@kotlin.Metadata -public final enum class Colors { - // source: 'annoOnNotClass.kt' - private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries - private synthetic final static field $VALUES: Colors[] - public final enum static field RED: Colors - public final enum static field WHITE: Colors - private synthetic final static method $values(): Colors[] - static method (): void - private method (p0: java.lang.String, p1: int): void - public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries - public static method valueOf(p0: java.lang.String): Colors - public static method values(): Colors[] -} - -@NoArg -@kotlin.Metadata -public interface Intf { - // source: 'annoOnNotClass.kt' -} - -@kotlin.Metadata -public final class MyClass { - // source: 'annoOnNotClass.kt' - private @NoArg @org.jetbrains.annotations.NotNull field abc: java.lang.String - public method (p0: int): void - public final @NoArg @org.jetbrains.annotations.NotNull method getAbc(): java.lang.String - public final @NoArg method setAbc(@org.jetbrains.annotations.NotNull p0: java.lang.String): void - public final @NoArg method someFun(): void -} - -@NoArg -@java.lang.annotation.Retention(value=RUNTIME) -@kotlin.Metadata -public annotation class NoArg { - // source: 'annoOnNotClass.kt' -} - -@NoArg -@kotlin.Metadata -public final class Obj { - // source: 'annoOnNotClass.kt' - public final static @org.jetbrains.annotations.NotNull field INSTANCE: Obj - static method (): void - private method (): void -} diff --git a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.txt index 0ea86e421b1..8571b6db8e1 100644 --- a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.txt +++ b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.txt @@ -2,11 +2,14 @@ @kotlin.Metadata public final enum class Colors { // source: 'annoOnNotClass.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: Colors[] public final enum static field RED: Colors public final enum static field WHITE: Colors + private synthetic final static method $values(): Colors[] static method (): void private method (p0: java.lang.String, p1: int): void + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Colors public static method values(): Colors[] }