diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt index f97dc7d39d1..b7e35223402 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmOverloadsAnnotation import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind -import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToInlineClassTypeValueParameters +import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToValueClassTypeValueParameters import org.jetbrains.org.objectweb.asm.Label import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Type @@ -269,7 +269,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) { if (classOrObject.isLocal) return false if (classDescriptor.isInlineClass()) return false - if (shouldHideConstructorDueToInlineClassTypeValueParameters(constructorDescriptor)) return false + if (shouldHideConstructorDueToValueClassTypeValueParameters(constructorDescriptor)) return false if (DescriptorUtils.isSealedClass(classDescriptor)) return false if (CodegenBinding.canHaveOuter(state.bindingContext, classDescriptor)) return false diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java index 372e6e070a3..e494ab1b287 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java @@ -53,7 +53,6 @@ import java.util.ArrayList; import java.util.List; import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isBoolean; -import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isPrimitiveClass; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.CodegenUtilKt.isToArrayFromCollection; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConstOrHasJvmFieldAnnotation; @@ -355,7 +354,7 @@ public class DescriptorAsmUtil { if (kind != OwnerKind.ERASED_INLINE_CLASS && memberDescriptor instanceof ConstructorDescriptor && !(memberDescriptor instanceof AccessorForConstructorDescriptor) && - InlineClassManglingRulesKt.shouldHideConstructorDueToInlineClassTypeValueParameters((ConstructorDescriptor) memberDescriptor) + InlineClassManglingRulesKt.shouldHideConstructorDueToValueClassTypeValueParameters((ConstructorDescriptor) memberDescriptor) ) { return ACC_PRIVATE; } @@ -898,7 +897,7 @@ public class DescriptorAsmUtil { if (!(descriptor instanceof ClassConstructorDescriptor)) return false; ClassConstructorDescriptor classConstructorDescriptor = (ClassConstructorDescriptor) descriptor; - if (InlineClassManglingRulesKt.shouldHideConstructorDueToInlineClassTypeValueParameters(descriptor)) { + if (InlineClassManglingRulesKt.shouldHideConstructorDueToValueClassTypeValueParameters(descriptor)) { return true; } if (isSealedClass(classConstructorDescriptor.getConstructedClass()) && diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index fb8c7f6d90d..6acb65c83b6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -82,7 +82,7 @@ import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getInlineClassRepresentation; import static org.jetbrains.kotlin.resolve.inline.InlineOnlyKt.isInlineOnlyPrivateInBytecode; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; -import static org.jetbrains.kotlin.resolve.jvm.InlineClassManglingRulesKt.shouldHideConstructorDueToInlineClassTypeValueParameters; +import static org.jetbrains.kotlin.resolve.jvm.InlineClassManglingRulesKt.shouldHideConstructorDueToValueClassTypeValueParameters; import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -270,11 +270,11 @@ public class FunctionCodegen { ) { if (functionDescriptor instanceof AccessorForConstructorDescriptor) { ConstructorDescriptor originalConstructor = ((AccessorForConstructorDescriptor) functionDescriptor).getCalleeDescriptor(); - if (shouldHideConstructorDueToInlineClassTypeValueParameters(originalConstructor)) { + if (shouldHideConstructorDueToValueClassTypeValueParameters(originalConstructor)) { functionDescriptor = originalConstructor; } } - else if (shouldHideConstructorDueToInlineClassTypeValueParameters(functionDescriptor)) { + else if (shouldHideConstructorDueToValueClassTypeValueParameters(functionDescriptor)) { return; } @@ -293,7 +293,7 @@ public class FunctionCodegen { boolean skipNullabilityAnnotations ) { FunctionDescriptor annotationsOwner; - if (shouldHideConstructorDueToInlineClassTypeValueParameters(functionDescriptor)) { + if (shouldHideConstructorDueToValueClassTypeValueParameters(functionDescriptor)) { if (functionDescriptor instanceof AccessorForConstructorDescriptor) { annotationsOwner = ((AccessorForConstructorDescriptor) functionDescriptor).getCalleeDescriptor(); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/callableReferenceUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/callableReferenceUtil.kt index 6a92a225d9c..ba683edc83e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/callableReferenceUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/callableReferenceUtil.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.isGetterOfUnderlyingPropertyOfInlineClass import org.jetbrains.kotlin.resolve.isInlineClass import org.jetbrains.kotlin.resolve.jvm.AsmTypes -import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToInlineClassTypeValueParameters +import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToValueClassTypeValueParameters import org.jetbrains.kotlin.resolve.source.KotlinSourceElement import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.typeUtil.builtIns @@ -191,7 +191,7 @@ private fun getSignatureString(callable: CallableDescriptor, state: GenerationSt val accessor = when (callable) { is ClassConstructorDescriptor -> - if (shouldHideConstructorDueToInlineClassTypeValueParameters(callable)) + if (shouldHideConstructorDueToValueClassTypeValueParameters(callable)) AccessorForConstructorDescriptor(callable, callable.containingDeclaration, null, AccessorKind.NORMAL) else callable diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt index 7db913e42d1..e7368e354b5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmFieldApplicabilityChecker.kt @@ -32,8 +32,7 @@ import org.jetbrains.kotlin.resolve.checkers.DeclarationChecker import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmFieldAnnotation import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm -import org.jetbrains.kotlin.resolve.jvm.isInlineClassThatRequiresMangling -import org.jetbrains.kotlin.resolve.needsMfvcFlattening +import org.jetbrains.kotlin.resolve.jvm.isValueClassThatRequiresMangling import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.MemberScope @@ -64,8 +63,7 @@ class JvmFieldApplicabilityChecker : DeclarationChecker { } DescriptorUtils.isTopLevelDeclaration(descriptor) && declaration.isInsideJvmMultifileClassFile() -> TOP_LEVEL_PROPERTY_OF_MULTIFILE_FACADE - descriptor.returnType?.isInlineClassThatRequiresMangling() == true -> RETURN_TYPE_IS_VALUE_CLASS - descriptor.returnType?.needsMfvcFlattening() == true -> RETURN_TYPE_IS_VALUE_CLASS + descriptor.returnType?.isValueClassThatRequiresMangling() == true -> RETURN_TYPE_IS_VALUE_CLASS else -> return } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt index b51b224e247..bbbce61aa60 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt @@ -37,15 +37,14 @@ import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext import org.jetbrains.kotlin.resolve.descriptorUtil.isAnnotationConstructor import org.jetbrains.kotlin.resolve.descriptorUtil.propertyIfAccessor import org.jetbrains.kotlin.resolve.inline.InlineUtil -import org.jetbrains.kotlin.resolve.isMultiFieldValueClass import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmOverloadsAnnotation import org.jetbrains.kotlin.resolve.jvm.annotations.findSynchronizedAnnotation import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmFieldAnnotation import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm -import org.jetbrains.kotlin.resolve.jvm.isInlineClassThatRequiresMangling +import org.jetbrains.kotlin.resolve.jvm.isValueClassThatRequiresMangling import org.jetbrains.kotlin.resolve.jvm.requiresFunctionNameManglingForParameterTypes import org.jetbrains.kotlin.resolve.jvm.requiresFunctionNameManglingForReturnType -import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToInlineClassTypeValueParameters +import org.jetbrains.kotlin.resolve.jvm.shouldHideConstructorDueToValueClassTypeValueParameters class LocalFunInlineChecker : DeclarationChecker { override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) { @@ -156,9 +155,7 @@ class JvmNameAnnotationChecker : DeclarationChecker { if (descriptor is CallableMemberDescriptor) { if (DescriptorUtils.isOverride(descriptor) || descriptor.isOverridable) { diagnosticHolder.report(ErrorsJvm.INAPPLICABLE_JVM_NAME.on(annotationEntry)) - } else if (descriptor.containingDeclaration.isInlineClassThatRequiresMangling()) { - diagnosticHolder.report(ErrorsJvm.INAPPLICABLE_JVM_NAME.on(annotationEntry)) - } else if (descriptor.containingDeclaration.isMultiFieldValueClass()) { + } else if (descriptor.containingDeclaration.isValueClassThatRequiresMangling()) { diagnosticHolder.report(ErrorsJvm.INAPPLICABLE_JVM_NAME.on(annotationEntry)) } } @@ -257,7 +254,7 @@ class OverloadsAnnotationChecker : DeclarationChecker { (requiresFunctionNameManglingForParameterTypes(descriptor) || requiresFunctionNameManglingForReturnType(descriptor)) -> diagnosticHolder.report(ErrorsJvm.OVERLOADS_ANNOTATION_MANGLED_FUNCTION.on(annotationEntry)) - descriptor is ClassConstructorDescriptor && shouldHideConstructorDueToInlineClassTypeValueParameters(descriptor) -> + descriptor is ClassConstructorDescriptor && shouldHideConstructorDueToValueClassTypeValueParameters(descriptor) -> diagnosticHolder.report(ErrorsJvm.OVERLOADS_ANNOTATION_HIDDEN_CONSTRUCTOR.on(annotationEntry)) } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java index a8262be1742..73a5c6c770e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java @@ -53,8 +53,8 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension { MAP.put(OVERLOADS_PRIVATE, "'@JvmOverloads' annotation has no effect on private declarations"); MAP.put(OVERLOADS_LOCAL, "'@JvmOverloads' annotation cannot be used on local declarations"); MAP.put(OVERLOADS_ANNOTATION_CLASS_CONSTRUCTOR, "'@JvmOverloads' annotation cannot be used on constructors of annotation classes"); - MAP.put(OVERLOADS_ANNOTATION_HIDDEN_CONSTRUCTOR, "'@JvmOverloads' annotation cannot be used on constructors hidden by inline class rules"); - MAP.put(OVERLOADS_ANNOTATION_MANGLED_FUNCTION, "'@JvmOverloads' annotation cannot be used on functions mangled by inline class rules"); + MAP.put(OVERLOADS_ANNOTATION_HIDDEN_CONSTRUCTOR, "'@JvmOverloads' annotation cannot be used on constructors hidden by value class rules"); + MAP.put(OVERLOADS_ANNOTATION_MANGLED_FUNCTION, "'@JvmOverloads' annotation cannot be used on functions mangled by value class rules"); MAP.put(INAPPLICABLE_JVM_NAME, "'@JvmName' annotation is not applicable to this declaration"); MAP.put(ILLEGAL_JVM_NAME, "Illegal JVM name"); diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt index 75f87f0a1e7..4cc7f8a866c 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmDefaultConstructorLowering.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.ir.builders.declarations.addConstructor import org.jetbrains.kotlin.ir.builders.irBlockBody import org.jetbrains.kotlin.ir.builders.irDelegatingConstructorCall import org.jetbrains.kotlin.ir.declarations.IrClass -import org.jetbrains.kotlin.ir.declarations.isSingleFieldValueClass import org.jetbrains.kotlin.ir.util.constructors import org.jetbrains.kotlin.ir.util.copyAnnotationsFrom import org.jetbrains.kotlin.ir.util.hasDefaultValue @@ -38,7 +37,7 @@ internal val jvmDefaultConstructorPhase = makeIrFilePhase( private class JvmDefaultConstructorLowering(val context: JvmBackendContext) : ClassLoweringPass { override fun lower(irClass: IrClass) { - if (irClass.kind != ClassKind.CLASS || irClass.visibility == DescriptorVisibilities.LOCAL || irClass.isSingleFieldValueClass || irClass.isInner || + if (irClass.kind != ClassKind.CLASS || irClass.visibility == DescriptorVisibilities.LOCAL || irClass.isValue || irClass.isInner || irClass.modality == Modality.SEALED ) return @@ -47,7 +46,7 @@ private class JvmDefaultConstructorLowering(val context: JvmBackendContext) : Cl if (DescriptorVisibilities.isPrivate(primaryConstructor.visibility)) return - if (primaryConstructor.hasMangledParameters()) + if ((context.multiFieldValueClassReplacements.originalConstructorForConstructorReplacement[primaryConstructor] ?: primaryConstructor).hasMangledParameters()) return if (primaryConstructor.valueParameters.isEmpty() || !primaryConstructor.valueParameters.all { it.hasDefaultValue() }) diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt index 7dc5d265fd9..86884747128 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt @@ -373,7 +373,9 @@ private class SyntheticAccessorTransformer( get() { if (this in context.hiddenConstructorsWithMangledParams.keys) return true return isOrShouldBeHiddenDueToOrigin && !DescriptorVisibilities.isPrivate(visibility) - && !constructedClass.isValue && hasMangledParameters() && !constructedClass.isAnonymousObject + && !constructedClass.isValue && + (context.multiFieldValueClassReplacements.originalConstructorForConstructorReplacement[this] ?: this) + .hasMangledParameters() && !constructedClass.isAnonymousObject } private val IrConstructor.isOrShouldBeHiddenAsSealedClassConstructor: Boolean diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt index d044d885e00..c86e39fc90b 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt @@ -34,7 +34,7 @@ class MemoizedMultiFieldValueClassReplacements( val originalFunctionForStaticReplacement: MutableMap = ConcurrentHashMap() val originalFunctionForMethodReplacement: MutableMap = ConcurrentHashMap() - private val originalConstructorForConstructorReplacement: MutableMap = ConcurrentHashMap() + val originalConstructorForConstructorReplacement: MutableMap = ConcurrentHashMap() private fun IrValueParameter.grouped( name: String?, @@ -152,6 +152,9 @@ class MemoizedMultiFieldValueClassReplacements( data class RegularMapping(val valueParameter: IrValueParameter) : RemappedParameter() { override val valueParameters: List = listOf(valueParameter) + override fun toString(): String { + return "RegularMapping(valueParameter=${valueParameter.render()})" + } } data class MultiFieldValueClassMapping( @@ -167,6 +170,16 @@ class MemoizedMultiFieldValueClassReplacements( this(rootMfvcNode, makeTypeArgumentsFromType(type), valueParameters) val boxedType: IrSimpleType = rootMfvcNode.type.substitute(typeArguments) as IrSimpleType + override fun toString(): String { + return """MultiFieldValueClassMapping( + | rootMfvcNode=$rootMfvcNode, + | typeArguments=[${typeArguments.values.joinToString(",") { "\n " + it.render() }}], + | valueParameters=[${valueParameters.joinToString(",") { "\n " + it.render() }}], + | boxedType=${boxedType.render()} + |)""".trimMargin() + } + + } } @@ -196,11 +209,7 @@ class MemoizedMultiFieldValueClassReplacements( override fun createMethodReplacement(function: IrFunction): IrSimpleFunction = buildReplacement(function, function.origin) { originalFunctionForMethodReplacement[this] = function - dispatchReceiverParameter = function.dispatchReceiverParameter?.copyTo(this, index = -1) - val newFlattenedParameters = makeAndAddGroupedValueParametersFrom(function, includeDispatcherReceiver = false, mapOf(), this) - val receiver = dispatchReceiverParameter - val remappedParameters = - if (receiver != null) listOf(RemappedParameter.RegularMapping(receiver)) + newFlattenedParameters else newFlattenedParameters + val remappedParameters = makeMethodLikeRemappedParameters(function) bindingOldFunctionToParameterTemplateStructure[function] = remappedParameters bindingNewFunctionToParameterTemplateStructure[this] = remappedParameters } @@ -210,17 +219,28 @@ class MemoizedMultiFieldValueClassReplacements( updateFrom(constructor) returnType = constructor.returnType }.apply { - val newFlattenedParameters = makeAndAddGroupedValueParametersFrom(constructor, includeDispatcherReceiver = false, mapOf(), this) - bindingOldFunctionToParameterTemplateStructure[constructor] = newFlattenedParameters parent = constructor.parent + val remappedParameters = makeMethodLikeRemappedParameters(constructor) + bindingOldFunctionToParameterTemplateStructure[constructor] = remappedParameters copyTypeParametersFrom(constructor) annotations = constructor.annotations originalConstructorForConstructorReplacement[this] = constructor - bindingNewFunctionToParameterTemplateStructure[this] = newFlattenedParameters + bindingNewFunctionToParameterTemplateStructure[this] = remappedParameters + if (constructor.metadata != null) { + metadata = constructor.metadata + constructor.metadata = null + } } return newConstructor } + private fun IrFunction.makeMethodLikeRemappedParameters(function: IrFunction): List { + dispatchReceiverParameter = function.dispatchReceiverParameter?.copyTo(this, index = -1) + val newFlattenedParameters = makeAndAddGroupedValueParametersFrom(function, includeDispatcherReceiver = false, mapOf(), this) + val receiver = dispatchReceiverParameter + return if (receiver != null) listOf(RemappedParameter.RegularMapping(receiver)) + newFlattenedParameters else newFlattenedParameters + } + /** * Get a function replacement for a function or a constructor. */ @@ -297,6 +317,12 @@ class MemoizedMultiFieldValueClassReplacements( createIntermediateNodeForMfvcPropertyOfRegularClass(parent, context, property) } + private val fieldsToRemove = ConcurrentHashMap>() + fun getFieldsToRemove(clazz: IrClass): Set = fieldsToRemove[clazz] ?: emptySet() + fun addFieldToRemove(clazz: IrClass, field: IrField) { + fieldsToRemove.getOrPut(clazz) { ConcurrentHashMap().keySet(Unit) }.add(field) + } + fun getMfvcFieldNode(field: IrField): NameableMfvcNode? { val parent = field.parent val property = field.correspondingPropertySymbol?.owner diff --git a/compiler/testData/codegen/box/valueClasses/defaultParameters.txt b/compiler/testData/codegen/box/valueClasses/defaultParameters.txt index b818a8c91df..a1d350fc8df 100644 --- a/compiler/testData/codegen/box/valueClasses/defaultParameters.txt +++ b/compiler/testData/codegen/box/valueClasses/defaultParameters.txt @@ -74,9 +74,9 @@ public final class Wrapper { private final field segment-p1-y: double private final field segment-p2-x: double private final field segment-p2-y: double - public method (): void - public method (p0: double, p1: double, p2: double, p3: double, p4: int, p5: int): void + private method (p0: double, p1: double, p2: double, p3: double, p4: int, p5: int): void public synthetic method (p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: kotlin.jvm.internal.DefaultConstructorMarker): void + public synthetic method (p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: kotlin.jvm.internal.DefaultConstructorMarker): void public final @org.jetbrains.annotations.NotNull method component1(): DSegment public final method component2(): int public synthetic static method copy-GPBa7dw$default(p0: Wrapper, p1: double, p2: double, p3: double, p4: double, p5: int, p6: int, p7: int, p8: java.lang.Object): Wrapper diff --git a/compiler/testData/codegen/box/valueClasses/delegating.txt b/compiler/testData/codegen/box/valueClasses/delegating.txt index d096cf9d6a1..d37a36dbcf4 100644 --- a/compiler/testData/codegen/box/valueClasses/delegating.txt +++ b/compiler/testData/codegen/box/valueClasses/delegating.txt @@ -74,7 +74,8 @@ public final class C { // source: 'delegating.kt' private synthetic final field $$delegate_0-x: int private synthetic final field $$delegate_0-y: int - public method (p0: int, p1: int): void + private method (p0: int, p1: int): void + public synthetic method (p0: int, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public method getX(): int } diff --git a/compiler/testData/codegen/box/valueClasses/functionReferences.txt b/compiler/testData/codegen/box/valueClasses/functionReferences.txt index f023de46e26..91e86c036a6 100644 --- a/compiler/testData/codegen/box/valueClasses/functionReferences.txt +++ b/compiler/testData/codegen/box/valueClasses/functionReferences.txt @@ -3,7 +3,8 @@ public final class A { // source: 'test.kt' private final field point-x: double private final field point-y: double - public method (p0: double, p1: double): void + private method (p0: double, p1: double): void + public synthetic method (p0: double, p1: double, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public final method f-GPBa7dw(p0: double, p1: double, p2: double): double public final @org.jetbrains.annotations.NotNull method getPoint(): DPoint public synthetic final method getPoint-x(): double @@ -18,7 +19,6 @@ synthetic final class AnotherKt$any1$1 { inner (anonymous) class AnotherKt$any1$1 static method (): void method (): void - private final static method _init_$lambda$0(p0: double, p1: double): DPoint public final @org.jetbrains.annotations.NotNull method invoke(p0: double, p1: double): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } @@ -29,7 +29,6 @@ synthetic final class AnotherKt$any2$1 { enclosing method AnotherKt.any2-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any2$1 method (p0: java.lang.Object): void - private final static method _init_$f(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -42,7 +41,6 @@ synthetic final class AnotherKt$any2$2 { inner (anonymous) class AnotherKt$any2$2 static method (): void method (): void - private final static method _init_$f(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -53,8 +51,6 @@ synthetic final class AnotherKt$any3$1 { enclosing method AnotherKt.any3-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any3$1 method (p0: java.lang.Object): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -67,8 +63,6 @@ synthetic final class AnotherKt$any3$2 { inner (anonymous) class AnotherKt$any3$2 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -79,7 +73,6 @@ synthetic final class AnotherKt$any4$1 { enclosing method AnotherKt.any4-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any4$1 method (p0: java.lang.Object): void - private final static method _init_$suspendedInline(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -92,7 +85,6 @@ synthetic final class AnotherKt$any4$2 { inner (anonymous) class AnotherKt$any4$2 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -103,7 +95,6 @@ synthetic final class AnotherKt$any5$1 { enclosing method AnotherKt.any5-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any5$1 method (p0: java.lang.Object): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final method invoke-Qn1smSk(p0: double, p1: double, p2: int): int } @@ -116,7 +107,6 @@ synthetic final class AnotherKt$any5$2 { inner (anonymous) class AnotherKt$any5$2 static method (): void method (): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final method invoke-jXDDuk8(p0: double, p1: double, p2: double, p3: double, p4: int): int } @@ -127,7 +117,6 @@ synthetic final class AnotherKt$any6$1 { enclosing method AnotherKt.any6-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any6$1 method (p0: java.lang.Object): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -140,7 +129,6 @@ synthetic final class AnotherKt$any6$2 { inner (anonymous) class AnotherKt$any6$2 static method (): void method (): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -151,8 +139,6 @@ synthetic final class AnotherKt$any7$1 { enclosing method AnotherKt.any7-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any7$1 method (p0: java.lang.Object): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -165,8 +151,6 @@ synthetic final class AnotherKt$any7$2 { inner (anonymous) class AnotherKt$any7$2 static method (): void method (): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -177,8 +161,6 @@ synthetic final class AnotherKt$any8$1 { enclosing method AnotherKt.any8-sUp7gFk(DD)Ljava/lang/Object; inner (anonymous) class AnotherKt$any8$1 method (p0: java.lang.Object): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -191,8 +173,6 @@ synthetic final class AnotherKt$any8$2 { inner (anonymous) class AnotherKt$any8$2 static method (): void method (): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -341,7 +321,6 @@ synthetic final class TestKt$box$100 { inner (anonymous) class TestKt$box$100 static method (): void method (): void - private final static method _init_$g(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -354,7 +333,6 @@ synthetic final class TestKt$box$101 { inner (anonymous) class TestKt$box$101 static method (): void method (): void - private final static method _init_$g(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -365,7 +343,6 @@ synthetic final class TestKt$box$102 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$102 method (p0: java.lang.Object): void - private final static method _init_$f(p0: A, p1: DPoint, p2: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -376,7 +353,6 @@ synthetic final class TestKt$box$103 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$103 method (p0: java.lang.Object): void - private final static method _init_$f(p0: A, p1: DPoint, p2: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -389,7 +365,6 @@ synthetic final class TestKt$box$104 { inner (anonymous) class TestKt$box$104 static method (): void method (): void - private final static method _init_$f(p0: A, p1: DPoint, p2: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-lIoT8es(@org.jetbrains.annotations.NotNull p0: A, p1: double, p2: double, p3: double): java.lang.Double } @@ -402,7 +377,6 @@ synthetic final class TestKt$box$105 { inner (anonymous) class TestKt$box$105 static method (): void method (): void - private final static method _init_$f(p0: A, p1: DPoint, p2: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-lIoT8es(@org.jetbrains.annotations.NotNull p0: A, p1: double, p2: double, p3: double): java.lang.Double } @@ -415,7 +389,6 @@ synthetic final class TestKt$box$106 { inner (anonymous) class TestKt$box$106 static method (): void method (): void - private final static method _init_$plus(p0: DPoint, p1: DPoint): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double, p3: double): DPoint } @@ -428,7 +401,6 @@ synthetic final class TestKt$box$107 { inner (anonymous) class TestKt$box$107 static method (): void method (): void - private final static method _init_$plus(p0: DPoint, p1: DPoint): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double, p3: double): DPoint } @@ -516,8 +488,6 @@ synthetic final class TestKt$box$12$1 { inner (anonymous) class TestKt$box$12$1 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -548,8 +518,6 @@ synthetic final class TestKt$box$13$2 { inner (anonymous) class TestKt$box$13$2 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -580,8 +548,6 @@ synthetic final class TestKt$box$14$2 { inner (anonymous) class TestKt$box$14$2 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -612,7 +578,6 @@ synthetic final class TestKt$box$15$1 { inner (anonymous) class TestKt$box$15$1 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -643,7 +608,6 @@ synthetic final class TestKt$box$16$2 { inner (anonymous) class TestKt$box$16$2 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -674,7 +638,6 @@ synthetic final class TestKt$box$17$2 { inner (anonymous) class TestKt$box$17$2 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -903,8 +866,6 @@ synthetic final class TestKt$box$24$1 { inner (anonymous) class TestKt$box$24$1 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -935,8 +896,6 @@ synthetic final class TestKt$box$25$2 { inner (anonymous) class TestKt$box$25$2 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -967,8 +926,6 @@ synthetic final class TestKt$box$26$2 { inner (anonymous) class TestKt$box$26$2 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -999,7 +956,6 @@ synthetic final class TestKt$box$27$1 { inner (anonymous) class TestKt$box$27$1 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1030,7 +986,6 @@ synthetic final class TestKt$box$28$2 { inner (anonymous) class TestKt$box$28$2 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1061,7 +1016,6 @@ synthetic final class TestKt$box$29$2 { inner (anonymous) class TestKt$box$29$2 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1289,7 +1243,6 @@ synthetic final class TestKt$box$47 { inner (anonymous) class TestKt$box$47 static method (): void method (): void - private final static method _init_$plus(p0: DPoint, p1: DPoint): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double, p3: double): DPoint } @@ -1326,7 +1279,6 @@ synthetic final class TestKt$box$53 { inner (anonymous) class TestKt$box$53 static method (): void method (): void - private final static method _init_$lambda$0(p0: double, p1: double): DPoint public final @org.jetbrains.annotations.NotNull method invoke(p0: double, p1: double): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } @@ -1339,7 +1291,6 @@ synthetic final class TestKt$box$55 { inner (anonymous) class TestKt$box$55 static method (): void method (): void - private final static method _init_$lambda$0(p0: double, p1: double): DPoint public final @org.jetbrains.annotations.NotNull method invoke(p0: double, p1: double): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } @@ -1352,7 +1303,6 @@ synthetic final class TestKt$box$56 { inner (anonymous) class TestKt$box$56 static method (): void method (): void - private final static method _init_$lambda$0(p0: double, p1: double): DPoint public final @org.jetbrains.annotations.NotNull method invoke(p0: double, p1: double): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } @@ -1365,7 +1315,6 @@ synthetic final class TestKt$box$57 { inner (anonymous) class TestKt$box$57 static method (): void method (): void - private final static method _init_$lambda$0(p0: double, p1: double): DPoint public final @org.jetbrains.annotations.NotNull method invoke(p0: double, p1: double): DPoint public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object } @@ -1376,7 +1325,6 @@ synthetic final class TestKt$box$58 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$58 method (p0: java.lang.Object): void - private final static method _init_$f(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -1387,7 +1335,6 @@ synthetic final class TestKt$box$59 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$59 method (p0: java.lang.Object): void - private final static method _init_$f(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -1416,7 +1363,6 @@ synthetic final class TestKt$box$60 { inner (anonymous) class TestKt$box$60 static method (): void method (): void - private final static method _init_$f(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -1429,7 +1375,6 @@ synthetic final class TestKt$box$61 { inner (anonymous) class TestKt$box$61 static method (): void method (): void - private final static method _init_$f(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -1440,7 +1385,6 @@ synthetic final class TestKt$box$62 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$62 method (p0: java.lang.Object): void - private final static method _init_$f(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -1453,7 +1397,6 @@ synthetic final class TestKt$box$63 { inner (anonymous) class TestKt$box$63 static method (): void method (): void - private final static method _init_$f(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -1464,8 +1407,6 @@ synthetic final class TestKt$box$64 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$64 method (p0: java.lang.Object): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -1476,8 +1417,6 @@ synthetic final class TestKt$box$65 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$65 method (p0: java.lang.Object): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -1490,8 +1429,6 @@ synthetic final class TestKt$box$66 { inner (anonymous) class TestKt$box$66 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1504,8 +1441,6 @@ synthetic final class TestKt$box$67 { inner (anonymous) class TestKt$box$67 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1516,8 +1451,6 @@ synthetic final class TestKt$box$68 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$68 method (p0: java.lang.Object): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -1530,8 +1463,6 @@ synthetic final class TestKt$box$69 { inner (anonymous) class TestKt$box$69 static method (): void method (): void - private final static method _init_$suspended(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspended(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1558,7 +1489,6 @@ synthetic final class TestKt$box$70 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$70 method (p0: java.lang.Object): void - private final static method _init_$suspendedInline(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -1569,7 +1499,6 @@ synthetic final class TestKt$box$71 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$71 method (p0: java.lang.Object): void - private final static method _init_$suspendedInline(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -1582,7 +1511,6 @@ synthetic final class TestKt$box$72 { inner (anonymous) class TestKt$box$72 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1595,7 +1523,6 @@ synthetic final class TestKt$box$73 { inner (anonymous) class TestKt$box$73 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1606,7 +1533,6 @@ synthetic final class TestKt$box$74 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$74 method (p0: java.lang.Object): void - private final static method _init_$suspendedInline(p0: DPoint, p1: kotlin.coroutines.Continuation): java.lang.Object 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 } @@ -1619,7 +1545,6 @@ synthetic final class TestKt$box$75 { inner (anonymous) class TestKt$box$75 static method (): void method (): void - private final static method _init_$suspendedInline(p0: DPoint, 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 @org.jetbrains.annotations.Nullable method invoke-GPBa7dw(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.Continuation): java.lang.Object } @@ -1630,7 +1555,6 @@ synthetic final class TestKt$box$76 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$76 method (p0: java.lang.Object): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final method invoke-Qn1smSk(p0: double, p1: double, p2: int): int } @@ -1641,7 +1565,6 @@ synthetic final class TestKt$box$77 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$77 method (p0: java.lang.Object): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final method invoke-Qn1smSk(p0: double, p1: double, p2: int): int } @@ -1654,7 +1577,6 @@ synthetic final class TestKt$box$78 { inner (anonymous) class TestKt$box$78 static method (): void method (): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final method invoke-jXDDuk8(p0: double, p1: double, p2: double, p3: double, p4: int): int } @@ -1667,7 +1589,6 @@ synthetic final class TestKt$box$79 { inner (anonymous) class TestKt$box$79 static method (): void method (): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final method invoke-jXDDuk8(p0: double, p1: double, p2: double, p3: double, p4: int): int } @@ -1694,7 +1615,6 @@ synthetic final class TestKt$box$80 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$80 method (p0: java.lang.Object): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final method invoke-Qn1smSk(p0: double, p1: double, p2: int): int } @@ -1707,7 +1627,6 @@ synthetic final class TestKt$box$81 { inner (anonymous) class TestKt$box$81 static method (): void method (): void - private final static method _init_$functionWithInlineClass(p0: DPoint, p1: DPoint, p2: int): int public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final method invoke-jXDDuk8(p0: double, p1: double, p2: double, p3: double, p4: int): int } @@ -1718,7 +1637,6 @@ synthetic final class TestKt$box$82 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$82 method (p0: java.lang.Object): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -1729,7 +1647,6 @@ synthetic final class TestKt$box$83 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$83 method (p0: java.lang.Object): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -1742,7 +1659,6 @@ synthetic final class TestKt$box$84 { inner (anonymous) class TestKt$box$84 static method (): void method (): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -1755,7 +1671,6 @@ synthetic final class TestKt$box$85 { inner (anonymous) class TestKt$box$85 static method (): void method (): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -1766,7 +1681,6 @@ synthetic final class TestKt$box$86 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$86 method (p0: java.lang.Object): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public final @org.jetbrains.annotations.NotNull method invoke(p0: double): java.lang.Double public synthetic bridge method invoke(p0: java.lang.Object): java.lang.Object } @@ -1779,7 +1693,6 @@ synthetic final class TestKt$box$87 { inner (anonymous) class TestKt$box$87 static method (): void method (): void - private final static method _init_$extensionFunction(p0: DPoint, p1: double): double public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke-GPBa7dw(p0: double, p1: double, p2: double): java.lang.Double } @@ -1790,8 +1703,6 @@ synthetic final class TestKt$box$88 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$88 method (p0: java.lang.Object): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -1802,8 +1713,6 @@ synthetic final class TestKt$box$89 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$89 method (p0: java.lang.Object): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -1832,8 +1741,6 @@ synthetic final class TestKt$box$90 { inner (anonymous) class TestKt$box$90 static method (): void method (): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -1846,8 +1753,6 @@ synthetic final class TestKt$box$91 { inner (anonymous) class TestKt$box$91 static method (): void method (): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -1858,8 +1763,6 @@ synthetic final class TestKt$box$92 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$92 method (p0: java.lang.Object): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -1872,8 +1775,6 @@ synthetic final class TestKt$box$93 { inner (anonymous) class TestKt$box$93 static method (): void method (): void - private final static method _init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -1884,8 +1785,6 @@ synthetic final class TestKt$box$94 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$94 method (p0: java.lang.Object): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -1896,8 +1795,6 @@ synthetic final class TestKt$box$95 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$95 method (p0: java.lang.Object): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -1910,8 +1807,6 @@ synthetic final class TestKt$box$96 { inner (anonymous) class TestKt$box$96 static method (): void method (): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -1924,8 +1819,6 @@ synthetic final class TestKt$box$97 { inner (anonymous) class TestKt$box$97 static method (): void method (): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } @@ -1936,8 +1829,6 @@ synthetic final class TestKt$box$98 { enclosing method TestKt.box()Ljava/lang/String; inner (anonymous) class TestKt$box$98 method (p0: java.lang.Object): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-lIoT8es(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p3: kotlin.coroutines.Continuation): java.lang.Object } @@ -1950,8 +1841,6 @@ synthetic final class TestKt$box$99 { inner (anonymous) class TestKt$box$99 static method (): void method (): void - private final static method _init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object - public synthetic final static method access$_init_$suspendInlineFunctionWithLambda(p0: DPoint, p1: DPoint, p2: kotlin.jvm.functions.Function2, p3: kotlin.coroutines.Continuation): java.lang.Object public synthetic bridge method invoke(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): java.lang.Object public final @org.jetbrains.annotations.Nullable method invoke-552ch2I(p0: double, p1: double, p2: double, p3: double, @org.jetbrains.annotations.NotNull p4: kotlin.jvm.functions.Function2, @org.jetbrains.annotations.NotNull p5: kotlin.coroutines.Continuation): java.lang.Object } diff --git a/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt b/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt index 62ec2bf959e..2521e1aee25 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt @@ -3,7 +3,8 @@ public final class A { // source: 'mfvcFieldInitializationOrder.kt' private field x-x: double private field x-y: double - public method (p0: double, p1: double): void + private method (p0: double, p1: double): void + public synthetic method (p0: double, p1: double, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public final @org.jetbrains.annotations.NotNull method getX(): DPoint public synthetic final method getX-x(): double public synthetic final method getX-y(): double diff --git a/compiler/testData/codegen/box/valueClasses/overrides.txt b/compiler/testData/codegen/box/valueClasses/overrides.txt index 449efdd86c7..a37f552169e 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides.txt @@ -2467,7 +2467,8 @@ public final class RealOverride { // source: 'overrides.kt' private field p-x: double private field p-y: double - public method (p0: double, p1: double): void + private method (p0: double, p1: double): void + public synthetic method (p0: double, p1: double, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public @org.jetbrains.annotations.NotNull method getP(): DPoint public synthetic bridge method getP(): java.lang.Object public synthetic method getP-x(): double diff --git a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt index 3f69cb366d3..798ccc5d323 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt @@ -1121,7 +1121,7 @@ final class Overrides_typeParametersKt$box$40 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$40 - method (p0: RealOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: RealOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1147,7 +1147,7 @@ final class Overrides_typeParametersKt$box$42 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$42 - method (p0: RealOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: RealOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1173,7 +1173,7 @@ final class Overrides_typeParametersKt$box$44 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$44 - method (p0: RealOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: RealOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1186,7 +1186,7 @@ final class Overrides_typeParametersKt$box$45 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$45 - method (p0: RealOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: RealOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1199,7 +1199,7 @@ final class Overrides_typeParametersKt$box$46 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$46 - method (p0: RealOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: RealOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1212,7 +1212,7 @@ final class Overrides_typeParametersKt$box$47 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$47 - method (p0: RealOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: RealOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1433,7 +1433,7 @@ final class Overrides_typeParametersKt$box$64 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$64 - method (p0: ReifiedFakeOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: ReifiedFakeOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1446,7 +1446,7 @@ final class Overrides_typeParametersKt$box$65 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$65 - method (p0: ReifiedFakeOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: ReifiedFakeOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1459,7 +1459,7 @@ final class Overrides_typeParametersKt$box$66 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$66 - method (p0: ReifiedFakeOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: ReifiedFakeOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1472,7 +1472,7 @@ final class Overrides_typeParametersKt$box$67 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$67 - method (p0: ReifiedFakeOverride, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: ReifiedFakeOverride): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1485,7 +1485,7 @@ final class Overrides_typeParametersKt$box$68 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$68 - method (p0: GenericFakeOverrideWithMFVCUpperBound, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: GenericFakeOverrideWithMFVCUpperBound): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1498,7 +1498,7 @@ final class Overrides_typeParametersKt$box$69 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$69 - method (p0: GenericFakeOverrideWithMFVCUpperBound, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: GenericFakeOverrideWithMFVCUpperBound): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1523,7 +1523,7 @@ final class Overrides_typeParametersKt$box$70 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$70 - method (p0: GenericFakeOverrideWithMFVCUpperBound, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: GenericFakeOverrideWithMFVCUpperBound): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -1536,7 +1536,7 @@ final class Overrides_typeParametersKt$box$71 { synthetic final field $xPoint-x: java.lang.Object synthetic final field $xPoint-y: java.lang.Object inner (anonymous) class Overrides_typeParametersKt$box$71 - method (p0: GenericFakeOverrideWithMFVCUpperBound, p1: java.lang.Object, p2: java.lang.Object): void + method (p0: java.lang.Object, p1: java.lang.Object, p2: GenericFakeOverrideWithMFVCUpperBound): void public synthetic bridge method invoke(): java.lang.Object public final method invoke(): void } @@ -2379,7 +2379,8 @@ public final class RealOverride { // source: 'overrides_typeParameters.kt' private field p-x: java.lang.Object private field p-y: java.lang.Object - public method (p0: java.lang.Object, p1: java.lang.Object): void + private method (p0: java.lang.Object, p1: java.lang.Object): void + public synthetic method (p0: java.lang.Object, p1: java.lang.Object, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public @org.jetbrains.annotations.NotNull method getP(): XPoint public synthetic bridge method getP(): java.lang.Object public synthetic method getP-x(): java.lang.Object diff --git a/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt b/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt index 77b9f6c524e..84039320217 100644 --- a/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt +++ b/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt @@ -25,7 +25,8 @@ public final class PointBox { // source: 'throwingMFVCReassignments.kt' private field value-x: double private field value-y: double - public method (p0: double, p1: double): void + private method (p0: double, p1: double): void + public synthetic method (p0: double, p1: double, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public final @org.jetbrains.annotations.NotNull method getValue(): DPoint public synthetic final method getValue-x(): double public synthetic final method getValue-y(): double diff --git a/compiler/testData/codegen/box/valueClasses/visibility.txt b/compiler/testData/codegen/box/valueClasses/visibility.txt index 88862c913d6..bce04b4cd1e 100644 --- a/compiler/testData/codegen/box/valueClasses/visibility.txt +++ b/compiler/testData/codegen/box/valueClasses/visibility.txt @@ -153,6 +153,7 @@ public final class PrivateInternal { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean + private final method getValue(): Internal public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -174,6 +175,7 @@ public final class PrivatePrivate { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean + private final method getValue(): Private public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -195,6 +197,7 @@ public final class PrivatePublic { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean + private final method getValue(): Public public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -328,6 +331,15 @@ public final class Regular$Companion { public synthetic final static method access$getJvmStaticX3(p0: Regular$Companion): Public public synthetic final static method access$getJvmStaticY3(p0: Regular$Companion): Internal public synthetic final static method access$getJvmStaticZ3(p0: Regular$Companion): Private + public synthetic final static method access$setJvmStaticX3-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticX4-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticX5-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticY3-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticY4-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticY5-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticZ3-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticZ4-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void + public synthetic final static method access$setJvmStaticZ5-sUp7gFk(p0: Regular$Companion, p1: int, p2: int): void public synthetic deprecated static @kotlin.jvm.JvmStatic method getJvmStaticX1$annotations(): void public final @org.jetbrains.annotations.NotNull method getJvmStaticX1(): Public public synthetic final method getJvmStaticX1-x(): int @@ -456,21 +468,39 @@ public final class Regular$Companion { public synthetic final method getStaticZ6-y(): int public final method setJvmStaticX1-sUp7gFk(p0: int, p1: int): void public final method setJvmStaticX2-sUp7gFk$main(p0: int, p1: int): void + private final method setJvmStaticX3-sUp7gFk(p0: int, p1: int): void + private final method setJvmStaticX4-sUp7gFk(p0: int, p1: int): void + private final method setJvmStaticX5-sUp7gFk(p0: int, p1: int): void public final method setJvmStaticX6-sUp7gFk$main(p0: int, p1: int): void public final method setJvmStaticY1-sUp7gFk(p0: int, p1: int): void public final method setJvmStaticY2-sUp7gFk$main(p0: int, p1: int): void + private final method setJvmStaticY3-sUp7gFk(p0: int, p1: int): void + private final method setJvmStaticY4-sUp7gFk(p0: int, p1: int): void + private final method setJvmStaticY5-sUp7gFk(p0: int, p1: int): void public final method setJvmStaticY6-sUp7gFk$main(p0: int, p1: int): void public final method setJvmStaticZ1-sUp7gFk(p0: int, p1: int): void public final method setJvmStaticZ2-sUp7gFk$main(p0: int, p1: int): void + private final method setJvmStaticZ3-sUp7gFk(p0: int, p1: int): void + private final method setJvmStaticZ4-sUp7gFk(p0: int, p1: int): void + private final method setJvmStaticZ5-sUp7gFk(p0: int, p1: int): void public final method setJvmStaticZ6-sUp7gFk$main(p0: int, p1: int): void public final method setStaticX1-sUp7gFk(p0: int, p1: int): void public final method setStaticX2-sUp7gFk$main(p0: int, p1: int): void + private final method setStaticX3-sUp7gFk(p0: int, p1: int): void + private final method setStaticX4-sUp7gFk(p0: int, p1: int): void + private final method setStaticX5-sUp7gFk(p0: int, p1: int): void public final method setStaticX6-sUp7gFk$main(p0: int, p1: int): void public final method setStaticY1-sUp7gFk(p0: int, p1: int): void public final method setStaticY2-sUp7gFk$main(p0: int, p1: int): void + private final method setStaticY3-sUp7gFk(p0: int, p1: int): void + private final method setStaticY4-sUp7gFk(p0: int, p1: int): void + private final method setStaticY5-sUp7gFk(p0: int, p1: int): void public final method setStaticY6-sUp7gFk$main(p0: int, p1: int): void public final method setStaticZ1-sUp7gFk(p0: int, p1: int): void public final method setStaticZ2-sUp7gFk$main(p0: int, p1: int): void + private final method setStaticZ3-sUp7gFk(p0: int, p1: int): void + private final method setStaticZ4-sUp7gFk(p0: int, p1: int): void + private final method setStaticZ5-sUp7gFk(p0: int, p1: int): void public final method setStaticZ6-sUp7gFk$main(p0: int, p1: int): void public final inner class Regular$Companion } @@ -665,36 +695,72 @@ public final class Regular { public synthetic final static method access$setJvmStaticX1-y$cp(p0: int): void public synthetic final static method access$setJvmStaticX2-x$cp(p0: int): void public synthetic final static method access$setJvmStaticX2-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticX3-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticX3-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticX4-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticX4-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticX5-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticX5-y$cp(p0: int): void public synthetic final static method access$setJvmStaticX6-x$cp(p0: int): void public synthetic final static method access$setJvmStaticX6-y$cp(p0: int): void public synthetic final static method access$setJvmStaticY1-x$cp(p0: int): void public synthetic final static method access$setJvmStaticY1-y$cp(p0: int): void public synthetic final static method access$setJvmStaticY2-x$cp(p0: int): void public synthetic final static method access$setJvmStaticY2-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticY3-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticY3-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticY4-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticY4-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticY5-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticY5-y$cp(p0: int): void public synthetic final static method access$setJvmStaticY6-x$cp(p0: int): void public synthetic final static method access$setJvmStaticY6-y$cp(p0: int): void public synthetic final static method access$setJvmStaticZ1-x$cp(p0: int): void public synthetic final static method access$setJvmStaticZ1-y$cp(p0: int): void public synthetic final static method access$setJvmStaticZ2-x$cp(p0: int): void public synthetic final static method access$setJvmStaticZ2-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticZ3-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticZ3-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticZ4-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticZ4-y$cp(p0: int): void + public synthetic final static method access$setJvmStaticZ5-x$cp(p0: int): void + public synthetic final static method access$setJvmStaticZ5-y$cp(p0: int): void public synthetic final static method access$setJvmStaticZ6-x$cp(p0: int): void public synthetic final static method access$setJvmStaticZ6-y$cp(p0: int): void public synthetic final static method access$setStaticX1-x$cp(p0: int): void public synthetic final static method access$setStaticX1-y$cp(p0: int): void public synthetic final static method access$setStaticX2-x$cp(p0: int): void public synthetic final static method access$setStaticX2-y$cp(p0: int): void + public synthetic final static method access$setStaticX3-x$cp(p0: int): void + public synthetic final static method access$setStaticX3-y$cp(p0: int): void + public synthetic final static method access$setStaticX4-x$cp(p0: int): void + public synthetic final static method access$setStaticX4-y$cp(p0: int): void + public synthetic final static method access$setStaticX5-x$cp(p0: int): void + public synthetic final static method access$setStaticX5-y$cp(p0: int): void public synthetic final static method access$setStaticX6-x$cp(p0: int): void public synthetic final static method access$setStaticX6-y$cp(p0: int): void public synthetic final static method access$setStaticY1-x$cp(p0: int): void public synthetic final static method access$setStaticY1-y$cp(p0: int): void public synthetic final static method access$setStaticY2-x$cp(p0: int): void public synthetic final static method access$setStaticY2-y$cp(p0: int): void + public synthetic final static method access$setStaticY3-x$cp(p0: int): void + public synthetic final static method access$setStaticY3-y$cp(p0: int): void + public synthetic final static method access$setStaticY4-x$cp(p0: int): void + public synthetic final static method access$setStaticY4-y$cp(p0: int): void + public synthetic final static method access$setStaticY5-x$cp(p0: int): void + public synthetic final static method access$setStaticY5-y$cp(p0: int): void public synthetic final static method access$setStaticY6-x$cp(p0: int): void public synthetic final static method access$setStaticY6-y$cp(p0: int): void public synthetic final static method access$setStaticZ1-x$cp(p0: int): void public synthetic final static method access$setStaticZ1-y$cp(p0: int): void public synthetic final static method access$setStaticZ2-x$cp(p0: int): void public synthetic final static method access$setStaticZ2-y$cp(p0: int): void + public synthetic final static method access$setStaticZ3-x$cp(p0: int): void + public synthetic final static method access$setStaticZ3-y$cp(p0: int): void + public synthetic final static method access$setStaticZ4-x$cp(p0: int): void + public synthetic final static method access$setStaticZ4-y$cp(p0: int): void + public synthetic final static method access$setStaticZ5-x$cp(p0: int): void + public synthetic final static method access$setStaticZ5-y$cp(p0: int): void public synthetic final static method access$setStaticZ6-x$cp(p0: int): void public synthetic final static method access$setStaticZ6-y$cp(p0: int): void public final method callAll(): void @@ -770,14 +836,41 @@ public final class Regular { public final @org.jetbrains.annotations.NotNull method getZ6(): Private public synthetic final method getZ6-x(): int public synthetic final method getZ6-y(): int + public final static method setJvmStaticX1-sUp7gFk(p0: int, p1: int): void + public final static method setJvmStaticX2-sUp7gFk$main(p0: int, p1: int): void + private final static method setJvmStaticX3-sUp7gFk(p0: int, p1: int): void + private final static method setJvmStaticX4-sUp7gFk(p0: int, p1: int): void + private final static method setJvmStaticX5-sUp7gFk(p0: int, p1: int): void + public final static method setJvmStaticX6-sUp7gFk$main(p0: int, p1: int): void + public final static method setJvmStaticY1-sUp7gFk(p0: int, p1: int): void + public final static method setJvmStaticY2-sUp7gFk$main(p0: int, p1: int): void + private final static method setJvmStaticY3-sUp7gFk(p0: int, p1: int): void + private final static method setJvmStaticY4-sUp7gFk(p0: int, p1: int): void + private final static method setJvmStaticY5-sUp7gFk(p0: int, p1: int): void + public final static method setJvmStaticY6-sUp7gFk$main(p0: int, p1: int): void + public final static method setJvmStaticZ1-sUp7gFk(p0: int, p1: int): void + public final static method setJvmStaticZ2-sUp7gFk$main(p0: int, p1: int): void + private final static method setJvmStaticZ3-sUp7gFk(p0: int, p1: int): void + private final static method setJvmStaticZ4-sUp7gFk(p0: int, p1: int): void + private final static method setJvmStaticZ5-sUp7gFk(p0: int, p1: int): void + public final static method setJvmStaticZ6-sUp7gFk$main(p0: int, p1: int): void public final method setX1-sUp7gFk(p0: int, p1: int): void public final method setX2-sUp7gFk$main(p0: int, p1: int): void + private final method setX3-sUp7gFk(p0: int, p1: int): void + private final method setX4-sUp7gFk(p0: int, p1: int): void + private final method setX5-sUp7gFk(p0: int, p1: int): void public final method setX6-sUp7gFk$main(p0: int, p1: int): void public final method setY1-sUp7gFk(p0: int, p1: int): void public final method setY2-sUp7gFk$main(p0: int, p1: int): void + private final method setY3-sUp7gFk(p0: int, p1: int): void + private final method setY4-sUp7gFk(p0: int, p1: int): void + private final method setY5-sUp7gFk(p0: int, p1: int): void public final method setY6-sUp7gFk$main(p0: int, p1: int): void public final method setZ1-sUp7gFk(p0: int, p1: int): void public final method setZ2-sUp7gFk$main(p0: int, p1: int): void + private final method setZ3-sUp7gFk(p0: int, p1: int): void + private final method setZ4-sUp7gFk(p0: int, p1: int): void + private final method setZ5-sUp7gFk(p0: int, p1: int): void public final method setZ6-sUp7gFk$main(p0: int, p1: int): void public final inner class Regular$Companion } diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt b/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt index 6844e395505..b244c53bf63 100644 --- a/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt +++ b/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt @@ -93,8 +93,10 @@ fun trySetSegment(segment: DSegment) { // 0 private D notImplemented // 0 private DPoint; center // 0 private D center -// 1 public \(DDDD\)V -// 0 public \(DDDD\)V.*(\n {3}.*)*(\n {4}.*box) +// 1 private \(DDDD\)V +// 0 private \(DDDD\)V.*(\n {3}.*)*(\n {4}.*box) +// 1 public synthetic \(DDDDLkotlin/jvm/internal/DefaultConstructorMarker;\)V +// 0 public synthetic \(DDDDLkotlin/jvm/internal/DefaultConstructorMarker;\)V.*(\n {3}.*)*(\n {4}.*box) // 1 public final getP1\(\)LDPoint; // 1 public final setP1-sUp7gFk\(DD\)V // 1 public final getP2\(\)LDPoint; diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt index 6864c7686cb..784c39da227 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt @@ -7,21 +7,17 @@ package org.jetbrains.kotlin.resolve.jvm import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe -import org.jetbrains.kotlin.resolve.isInlineClass -import org.jetbrains.kotlin.resolve.isInlineClassType import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound -fun shouldHideConstructorDueToInlineClassTypeValueParameters(descriptor: CallableMemberDescriptor): Boolean { +fun shouldHideConstructorDueToValueClassTypeValueParameters(descriptor: CallableMemberDescriptor): Boolean { val constructorDescriptor = descriptor as? ClassConstructorDescriptor ?: return false if (DescriptorVisibilities.isPrivate(constructorDescriptor.visibility)) return false - if (constructorDescriptor.constructedClass.isInlineClass()) return false + if (constructorDescriptor.constructedClass.isValueClass()) return false if (DescriptorUtils.isSealedClass(constructorDescriptor.constructedClass)) return false - // TODO inner class in inline class - return constructorDescriptor.valueParameters.any { it.type.requiresFunctionNameManglingInParameterTypes() } } @@ -35,22 +31,22 @@ fun requiresFunctionNameManglingForParameterTypes(descriptor: CallableMemberDesc fun requiresFunctionNameManglingForReturnType(descriptor: CallableMemberDescriptor): Boolean { if (descriptor.containingDeclaration !is ClassDescriptor) return false val returnType = descriptor.returnType ?: return false - return returnType.isInlineClassType() || returnType.isTypeParameterWithUpperBoundThatRequiresMangling() + return returnType.isInlineClassType() || returnType.isTypeParameterWithUpperBoundThatRequiresMangling(includeMfvc = false) } -fun DeclarationDescriptor.isInlineClassThatRequiresMangling(): Boolean = - isInlineClass() && !isDontMangleClass(this as ClassDescriptor) +fun DeclarationDescriptor.isValueClassThatRequiresMangling(): Boolean = + isValueClass() && !isDontMangleClass(this as ClassDescriptor) -fun KotlinType.isInlineClassThatRequiresMangling() = - constructor.declarationDescriptor?.isInlineClassThatRequiresMangling() == true +fun KotlinType.isValueClassThatRequiresMangling() = + constructor.declarationDescriptor?.let { it.isInlineClass() && it.isValueClassThatRequiresMangling() || needsMfvcFlattening() } == true private fun KotlinType.requiresFunctionNameManglingInParameterTypes() = - isInlineClassThatRequiresMangling() || isTypeParameterWithUpperBoundThatRequiresMangling() + isValueClassThatRequiresMangling() || isTypeParameterWithUpperBoundThatRequiresMangling(includeMfvc = true) private fun isDontMangleClass(classDescriptor: ClassDescriptor) = classDescriptor.fqNameSafe == StandardNames.RESULT_FQ_NAME -private fun KotlinType.isTypeParameterWithUpperBoundThatRequiresMangling(): Boolean { +private fun KotlinType.isTypeParameterWithUpperBoundThatRequiresMangling(includeMfvc: Boolean): Boolean { val descriptor = constructor.declarationDescriptor as? TypeParameterDescriptor ?: return false - return descriptor.representativeUpperBound.requiresFunctionNameManglingInParameterTypes() + return (includeMfvc || !descriptor.isMultiFieldValueClass()) && descriptor.representativeUpperBound.requiresFunctionNameManglingInParameterTypes() }