diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedInlineClassReplacements.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedInlineClassReplacements.kt index b0abc70b7fa..dcd96514ff3 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedInlineClassReplacements.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedInlineClassReplacements.kt @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter import org.jetbrains.kotlin.ir.builders.declarations.buildFun import org.jetbrains.kotlin.ir.declarations.* -import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl import org.jetbrains.kotlin.ir.types.impl.IrStarProjectionImpl import org.jetbrains.kotlin.ir.util.* @@ -59,7 +58,7 @@ class MemoizedInlineClassReplacements( // Mangle all functions in the body of an inline class it.parent.safeAs()?.isSingleFieldValueClass == true -> when { - it.isTypedEquals() -> createStaticReplacement(it).also { + it.isValueClassTypedEquals -> createStaticReplacement(it).also { it.name = InlineClassDescriptorResolver.SPECIALIZED_EQUALS_NAME specializedEqualsCache.computeIfAbsent(it.parentAsClass) { it } } 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 ac221455bd9..81949b23c9d 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 @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.defaultType import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.utils.addToStdlib.safeAs import java.util.concurrent.ConcurrentHashMap @@ -235,6 +236,10 @@ class MemoizedMultiFieldValueClassReplacements( // Do not check for overridden symbols because it makes previously overriding function not overriding would break a code. function.isMultiFieldValueClassFieldGetter -> makeMultiFieldValueClassFieldGetterReplacement(function) function.parent.safeAs()?.isMultiFieldValueClass == true -> when { + function.isValueClassTypedEquals -> createStaticReplacement(function).also { + it.name = InlineClassDescriptorResolver.SPECIALIZED_EQUALS_NAME + } + function.isRemoveAtSpecialBuiltinStub() -> null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt index 1bb0ea7cf10..9d3692e5946 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt @@ -1311,23 +1311,24 @@ fun IdSignature?.isComposite(): Boolean = this is IdSignature.CompositeSignature fun IrFunction.isToString(): Boolean = - name.asString() == "toString" && extensionReceiverParameter == null && contextReceiverParametersCount == 0 && valueParameters.isEmpty() + name == OperatorNameConventions.TO_STRING && extensionReceiverParameter == null && contextReceiverParametersCount == 0 && valueParameters.isEmpty() fun IrFunction.isHashCode() = - name.asString() == "hashCode" && extensionReceiverParameter == null && contextReceiverParametersCount == 0 && valueParameters.isEmpty() + name == OperatorNameConventions.HASH_CODE && extensionReceiverParameter == null && contextReceiverParametersCount == 0 && valueParameters.isEmpty() fun IrFunction.isEquals() = - name.asString() == "equals" && + name == OperatorNameConventions.EQUALS && extensionReceiverParameter == null && contextReceiverParametersCount == 0 && valueParameters.singleOrNull()?.type?.isNullableAny() == true -fun IrFunction.isTypedEquals(): Boolean { - val parentClass = parent as? IrClass ?: return false - val enclosingClassStartProjection = parentClass.symbol.starProjectedType - return name == OperatorNameConventions.EQUALS - && (returnType.isBoolean() || returnType.isNothing()) - && valueParameters.size == 1 - && (valueParameters[0].type == enclosingClassStartProjection) - && contextReceiverParametersCount == 0 && extensionReceiverParameter == null - && parentClass.isValue -} \ No newline at end of file +val IrFunction.isValueClassTypedEquals: Boolean + get() { + val parentClass = parent as? IrClass ?: return false + val enclosingClassStartProjection = parentClass.symbol.starProjectedType + return name == OperatorNameConventions.EQUALS + && (returnType.isBoolean() || returnType.isNothing()) + && valueParameters.size == 1 + && (valueParameters[0].type == enclosingClassStartProjection) + && contextReceiverParametersCount == 0 && extensionReceiverParameter == null + && (parentClass.isValue) + } diff --git a/compiler/testData/codegen/box/valueClasses/classFlattening.txt b/compiler/testData/codegen/box/valueClasses/classFlattening.txt index 630aa332ec4..1c2e57cb34f 100644 --- a/compiler/testData/codegen/box/valueClasses/classFlattening.txt +++ b/compiler/testData/codegen/box/valueClasses/classFlattening.txt @@ -84,7 +84,7 @@ public final class GreaterMfvc { public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String, p7: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -155,7 +155,7 @@ public final class SimpleMfvc { public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public final static @org.jetbrains.annotations.NotNull method getA3-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int, p4: int, @org.jetbrains.annotations.NotNull p5: java.lang.String): SimpleMfvc public final static @org.jetbrains.annotations.NotNull method getB1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc public final static @org.jetbrains.annotations.NotNull method getB2-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc diff --git a/compiler/testData/codegen/box/valueClasses/complex.fir.txt b/compiler/testData/codegen/box/valueClasses/complex.fir.txt index 3fff4cd5615..206083d9f1b 100644 --- a/compiler/testData/codegen/box/valueClasses/complex.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/complex.fir.txt @@ -117,7 +117,7 @@ public final class C { public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -160,7 +160,7 @@ public final class D { public final static @org.jetbrains.annotations.NotNull method constructor-impl(p0: int, p1: int, p2: int): D public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -183,7 +183,7 @@ public final class E { public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public final static @org.jetbrains.annotations.NotNull method getWithNonTrivialSetters-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): D public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int @@ -290,7 +290,7 @@ public final class R { public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int, p7: int, p8: int, p9: int, p10: java.lang.String, p11: java.util.List): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int, p7: int, p8: int, p9: int, p10: java.lang.String, p11: java.util.List): boolean public @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC(): R public static @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC-impl(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): R public method getFakeOverrideRegular(): int diff --git a/compiler/testData/codegen/box/valueClasses/complex.txt b/compiler/testData/codegen/box/valueClasses/complex.txt index 99aea261a8a..f8dd2747630 100644 --- a/compiler/testData/codegen/box/valueClasses/complex.txt +++ b/compiler/testData/codegen/box/valueClasses/complex.txt @@ -117,7 +117,7 @@ public final class C { public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -160,7 +160,7 @@ public final class D { public final static @org.jetbrains.annotations.NotNull method constructor-impl(p0: int, p1: int, p2: int): D public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -183,7 +183,7 @@ public final class E { public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean public final static @org.jetbrains.annotations.NotNull method getWithNonTrivialSetters-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): D public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int @@ -290,7 +290,7 @@ public final class R { public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int, p7: int, p8: int, p9: int, p10: java.lang.String, p11: java.util.List): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int, p7: int, p8: int, p9: int, p10: java.lang.String, p11: java.util.List): boolean public @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC(): R public static @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC-impl(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): R public method getFakeOverrideRegular(): int diff --git a/compiler/testData/codegen/box/valueClasses/conditionalExpressions.txt b/compiler/testData/codegen/box/valueClasses/conditionalExpressions.txt index 884dedd7b0c..9fc5090a38b 100644 --- a/compiler/testData/codegen/box/valueClasses/conditionalExpressions.txt +++ b/compiler/testData/codegen/box/valueClasses/conditionalExpressions.txt @@ -36,7 +36,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public final static method getCounter(): int public method hashCode(): int public static method hashCode-impl(p0: double, p1: double): int diff --git a/compiler/testData/codegen/box/valueClasses/defaultParameters.fir.txt b/compiler/testData/codegen/box/valueClasses/defaultParameters.fir.txt index 0b7ac7980ef..eb5138c9523 100644 --- a/compiler/testData/codegen/box/valueClasses/defaultParameters.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/defaultParameters.fir.txt @@ -9,7 +9,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public synthetic static method f1-lIoT8es$default(p0: double, p1: double, p2: int, p3: int, p4: double, p5: double, p6: int, p7: java.lang.Object): java.util.List public final static @org.jetbrains.annotations.NotNull method f1-lIoT8es(p0: double, p1: double, p2: int, p3: int, p4: double, p5: double): java.util.List public method hashCode(): int @@ -34,7 +34,7 @@ public final class DSegment { public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double, p4: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: double, p3: double, p4: int, p5: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double, p4: int, p5: double, p6: double, p7: double, p8: double, p9: int): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: int, p5: double, p6: double, p7: double, p8: double, p9: int): boolean public synthetic static method f2-lIoT8es$default(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: double, p8: double, p9: int, p10: java.lang.Object): java.util.List public final static @org.jetbrains.annotations.NotNull method f2-lIoT8es(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: double, p8: double): java.util.List public method hashCode(): int diff --git a/compiler/testData/codegen/box/valueClasses/defaultParameters.txt b/compiler/testData/codegen/box/valueClasses/defaultParameters.txt index 0b7ac7980ef..eb5138c9523 100644 --- a/compiler/testData/codegen/box/valueClasses/defaultParameters.txt +++ b/compiler/testData/codegen/box/valueClasses/defaultParameters.txt @@ -9,7 +9,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public synthetic static method f1-lIoT8es$default(p0: double, p1: double, p2: int, p3: int, p4: double, p5: double, p6: int, p7: java.lang.Object): java.util.List public final static @org.jetbrains.annotations.NotNull method f1-lIoT8es(p0: double, p1: double, p2: int, p3: int, p4: double, p5: double): java.util.List public method hashCode(): int @@ -34,7 +34,7 @@ public final class DSegment { public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double, p4: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: double, p3: double, p4: int, p5: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double, p4: int, p5: double, p6: double, p7: double, p8: double, p9: int): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: int, p5: double, p6: double, p7: double, p8: double, p9: int): boolean public synthetic static method f2-lIoT8es$default(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: double, p8: double, p9: int, p10: java.lang.Object): java.util.List public final static @org.jetbrains.annotations.NotNull method f2-lIoT8es(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: double, p8: double): java.util.List public method hashCode(): int diff --git a/compiler/testData/codegen/box/valueClasses/delegating.fir.txt b/compiler/testData/codegen/box/valueClasses/delegating.fir.txt index 8cb44c5905a..4c9292916f0 100644 --- a/compiler/testData/codegen/box/valueClasses/delegating.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/delegating.fir.txt @@ -9,7 +9,7 @@ public final class A { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public final static method getValue-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: kotlin.reflect.KProperty): int public final method getX(): int public method hashCode(): int diff --git a/compiler/testData/codegen/box/valueClasses/delegating.txt b/compiler/testData/codegen/box/valueClasses/delegating.txt index f6254bfe576..0efc141984e 100644 --- a/compiler/testData/codegen/box/valueClasses/delegating.txt +++ b/compiler/testData/codegen/box/valueClasses/delegating.txt @@ -9,7 +9,7 @@ public final class A { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public final static method getValue-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: kotlin.reflect.KProperty): int public method getX(): int public method hashCode(): int diff --git a/compiler/testData/codegen/box/valueClasses/equality.fir.txt b/compiler/testData/codegen/box/valueClasses/equality.fir.txt index 6491fcf47a4..bf6362a1892 100644 --- a/compiler/testData/codegen/box/valueClasses/equality.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/equality.fir.txt @@ -17,7 +17,7 @@ public final class A { public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -64,7 +64,7 @@ public final class B { public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, @org.jetbrains.annotations.NotNull p16: java.lang.String, p17: int, p18: int, @org.jetbrains.annotations.NotNull p19: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String, p20: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: java.lang.String, p27: int, p28: int, p29: java.lang.String, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: java.lang.String, p37: int, p38: int, p39: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: java.lang.String, p27: int, p28: int, p29: java.lang.String, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: java.lang.String, p37: int, p38: int, p39: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): int public final @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -150,7 +150,7 @@ public final class F3 { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/equality.txt b/compiler/testData/codegen/box/valueClasses/equality.txt index 6f1597af109..9cab488617f 100644 --- a/compiler/testData/codegen/box/valueClasses/equality.txt +++ b/compiler/testData/codegen/box/valueClasses/equality.txt @@ -17,7 +17,7 @@ public final class A { public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -64,7 +64,7 @@ public final class B { public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, @org.jetbrains.annotations.NotNull p16: java.lang.String, p17: int, p18: int, @org.jetbrains.annotations.NotNull p19: java.lang.String): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String, p20: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: java.lang.String, p27: int, p28: int, p29: java.lang.String, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: java.lang.String, p37: int, p38: int, p39: java.lang.String): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: java.lang.String, p27: int, p28: int, p29: java.lang.String, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: java.lang.String, p37: int, p38: int, p39: java.lang.String): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -150,7 +150,7 @@ public final class F3 { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/functionReferences.fir.txt b/compiler/testData/codegen/box/valueClasses/functionReferences.fir.txt index 611bfdc78f9..e400ea105f3 100644 --- a/compiler/testData/codegen/box/valueClasses/functionReferences.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/functionReferences.fir.txt @@ -21,7 +21,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public final static method f-impl(p0: double, p1: double, p2: double): double public method hashCode(): int public static method hashCode-impl(p0: double, p1: double): int diff --git a/compiler/testData/codegen/box/valueClasses/functionReferences.txt b/compiler/testData/codegen/box/valueClasses/functionReferences.txt index 611bfdc78f9..e400ea105f3 100644 --- a/compiler/testData/codegen/box/valueClasses/functionReferences.txt +++ b/compiler/testData/codegen/box/valueClasses/functionReferences.txt @@ -21,7 +21,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public final static method f-impl(p0: double, p1: double, p2: double): double public method hashCode(): int public static method hashCode-impl(p0: double, p1: double): int diff --git a/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.fir.txt index a5e47e0b491..5101336eac5 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.fir.txt @@ -9,7 +9,7 @@ public final class MFVC { public final static method constructor-impl(p0: int, p1: int): void public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public final method hashCode(): int public final static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.txt b/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.txt index 2261c424999..674ceb6b39b 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.txt @@ -9,7 +9,7 @@ public final class MFVC { public final static method constructor-impl(p0: int, p1: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.fir.txt index 1cf3c936c62..cda3cb24737 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.fir.txt @@ -9,7 +9,7 @@ public final class MFVC1 { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -29,7 +29,7 @@ public final class MFVC2 { public final static method constructor-impl(p0: int, p1: int): void public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.txt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.txt index 0cc4a1c0c16..5049f632a3b 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.txt @@ -9,7 +9,7 @@ public final class MFVC1 { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -29,7 +29,7 @@ public final class MFVC2 { public final static method constructor-impl(p0: int, p1: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.fir.txt index 56d9645c98d..77d5d6c02c9 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.fir.txt @@ -9,7 +9,7 @@ public final class MFVC { public final static method constructor-impl(p0: double, p1: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: int, p2: double, p3: int): boolean + public final static method equals-impl0(p0: double, p1: int, p2: double, p3: int): boolean public final method hashCode(): int public final static method hashCode-impl(p0: double, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.txt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.txt index 18d2716175a..90cf46c7e71 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.txt @@ -9,7 +9,7 @@ public final class MFVC { public final static method constructor-impl(p0: double, p1: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: int, p2: double, p3: int): boolean + public final static method equals-impl0(p0: double, p1: int, p2: double, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: double, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.fir.txt index 4dfecc6d8f7..84ed86ffabb 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.fir.txt @@ -15,8 +15,8 @@ public final class MFVC { public final static method constructor-impl(p0: int, p1: int): void 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 public final method equals-sUp7gFk(p0: int, p1: int): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.txt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.txt index 064ddfe595c..92e0cb91a30 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.txt @@ -15,8 +15,8 @@ public final class MFVC { public final static method constructor-impl(p0: int, p1: int): void 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 static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method equals-sUp7gFk(p0: int, p1: int): boolean - public static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt b/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt index 6434bdd22f3..fe8f71ee204 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt @@ -43,7 +43,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public method hashCode(): int public static method hashCode-impl(p0: double, p1: double): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.fir.txt index 83070fa7f77..16a9b1ec91b 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.fir.txt @@ -9,7 +9,7 @@ public final class A { public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: MyClass, p1: MyClass, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: MyClass, p1: MyClass, p2: MyClass, p3: MyClass): boolean + public final static method equals-impl0(p0: MyClass, p1: MyClass, p2: MyClass, p3: MyClass): boolean public final method hashCode(): int public final static method hashCode-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.txt b/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.txt index 10cdd92fbcf..d7d63e42f8e 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.txt @@ -9,7 +9,7 @@ public final class A { public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: MyClass, p1: MyClass, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: MyClass, p1: MyClass, p2: MyClass, p3: MyClass): boolean + public final static method equals-impl0(p0: MyClass, p1: MyClass, p2: MyClass, p3: MyClass): boolean public method hashCode(): int public static method hashCode-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.fir.txt index df7819a8de1..c16c150a91e 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.fir.txt @@ -20,7 +20,7 @@ public final class MFVC1 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int, p2: int, p3: int): boolean public static method equals-impl(p0: java.lang.Number, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Number, p3: int): boolean + public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Number, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: java.lang.Number, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -41,7 +41,7 @@ public final class MFVC2 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-GPBa7dw(@org.jetbrains.annotations.NotNull p0: Generic, p1: int, p2: double, p3: int, p4: int): boolean public static method equals-impl(p0: Generic, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(@org.jetbrains.annotations.NotNull p0: Generic, p1: int, @org.jetbrains.annotations.NotNull p2: Generic, p3: int): boolean + public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: Generic, p1: int, @org.jetbrains.annotations.NotNull p2: Generic, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: Generic, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -62,7 +62,7 @@ public final class MFVC3 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: java.lang.Object, p1: int, p2: int, p3: int): boolean public static method equals-impl(p0: java.lang.Object, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: java.lang.Object, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -83,7 +83,7 @@ public final class MFVC4 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: java.lang.Object, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Object, p3: int): boolean public static method equals-impl(p0: java.lang.Object, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: java.lang.Object, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.txt b/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.txt index df7819a8de1..c16c150a91e 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.txt @@ -20,7 +20,7 @@ public final class MFVC1 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int, p2: int, p3: int): boolean public static method equals-impl(p0: java.lang.Number, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Number, p3: int): boolean + public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Number, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: java.lang.Number, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -41,7 +41,7 @@ public final class MFVC2 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-GPBa7dw(@org.jetbrains.annotations.NotNull p0: Generic, p1: int, p2: double, p3: int, p4: int): boolean public static method equals-impl(p0: Generic, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(@org.jetbrains.annotations.NotNull p0: Generic, p1: int, @org.jetbrains.annotations.NotNull p2: Generic, p3: int): boolean + public final static method equals-impl0(@org.jetbrains.annotations.NotNull p0: Generic, p1: int, @org.jetbrains.annotations.NotNull p2: Generic, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: Generic, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -62,7 +62,7 @@ public final class MFVC3 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: java.lang.Object, p1: int, p2: int, p3: int): boolean public static method equals-impl(p0: java.lang.Object, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: java.lang.Object, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -83,7 +83,7 @@ public final class MFVC4 { public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: java.lang.Object, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.Object, p3: int): boolean public static method equals-impl(p0: java.lang.Object, p1: int, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: int, p2: java.lang.Object, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: java.lang.Object, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.fir.txt b/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.fir.txt index 5a1f39028ed..3ec1a146d37 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.fir.txt @@ -9,7 +9,7 @@ public final class MFVC { public final static method constructor-impl(p0: int, p1: int): void public final method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public final static method equals-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public final method hashCode(): int public final static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.txt b/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.txt index 7d3a79de2b3..1cf0d17cfc8 100644 --- a/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.txt +++ b/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.txt @@ -9,7 +9,7 @@ public final class MFVC { public final static method constructor-impl(p0: int, p1: int): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/overrides.fir.txt b/compiler/testData/codegen/box/valueClasses/overrides.fir.txt index 5608dae5324..6f0f8ef6b9d 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides.fir.txt @@ -23,7 +23,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public final @org.jetbrains.annotations.NotNull method getX(): java.lang.Double public synthetic bridge method getX(): java.lang.Object public final @org.jetbrains.annotations.NotNull method getY(): java.lang.Double @@ -47,7 +47,7 @@ public final class DPointWithInterface { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public final @org.jetbrains.annotations.NotNull method getSomethingGeneric(): DPoint public synthetic bridge method getSomethingGeneric(): java.lang.Object public final static @org.jetbrains.annotations.NotNull method getSomethingGeneric-impl(p0: double, p1: double): DPoint @@ -83,7 +83,7 @@ public final class DSegment { public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: double, p3: double, p4: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean public final @org.jetbrains.annotations.NotNull method getP1(): DPoint public synthetic bridge method getP1(): java.lang.Object public final @org.jetbrains.annotations.NotNull method getP2(): DPoint @@ -140,7 +140,7 @@ public final class GenericFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public synthetic bridge method getP(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint @@ -173,7 +173,7 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint @@ -2498,7 +2498,7 @@ public final class ReifiedFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint diff --git a/compiler/testData/codegen/box/valueClasses/overrides.txt b/compiler/testData/codegen/box/valueClasses/overrides.txt index f078377e5a3..2cba3ebcf09 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides.txt @@ -23,7 +23,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getX(): java.lang.Double public synthetic bridge method getX(): java.lang.Object public @org.jetbrains.annotations.NotNull method getY(): java.lang.Double @@ -47,7 +47,7 @@ public final class DPointWithInterface { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getSomethingGeneric(): DPoint public synthetic bridge method getSomethingGeneric(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getSomethingGeneric-impl(p0: double, p1: double): DPoint @@ -83,7 +83,7 @@ public final class DSegment { public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: double, p3: double, p4: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean public @org.jetbrains.annotations.NotNull method getP1(): DPoint public synthetic bridge method getP1(): java.lang.Object public @org.jetbrains.annotations.NotNull method getP2(): DPoint @@ -140,7 +140,7 @@ public final class GenericFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public synthetic bridge method getP(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint @@ -173,7 +173,7 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint @@ -2498,7 +2498,7 @@ public final class ReifiedFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint diff --git a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.fir.txt b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.fir.txt index 0b27f711785..e8f0daedac4 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.fir.txt @@ -23,7 +23,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public synthetic bridge method getX(): java.lang.Object public final method getX-3cLST_U(): double public synthetic bridge method getY(): java.lang.Object @@ -47,7 +47,7 @@ public final class DPointWithInterface { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public final @org.jetbrains.annotations.NotNull method getSomethingGeneric(): DPoint public synthetic bridge method getSomethingGeneric(): java.lang.Object public final static @org.jetbrains.annotations.NotNull method getSomethingGeneric-impl(p0: double, p1: double): DPoint @@ -83,7 +83,7 @@ public final class DSegment { public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: double, p3: double, p4: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean public final @org.jetbrains.annotations.NotNull method getP1(): DPoint public synthetic bridge method getP1(): java.lang.Object public final @org.jetbrains.annotations.NotNull method getP2(): DPoint @@ -140,7 +140,7 @@ public final class GenericFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public synthetic bridge method getP(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint @@ -173,7 +173,7 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint @@ -2515,7 +2515,7 @@ public final class ReifiedFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint diff --git a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.txt b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.txt index 6db4459600c..697dc295fb2 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.txt @@ -23,7 +23,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public synthetic bridge method getX(): java.lang.Object public method getX-3cLST_U(): double public synthetic bridge method getY(): java.lang.Object @@ -47,7 +47,7 @@ public final class DPointWithInterface { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getSomethingGeneric(): DPoint public synthetic bridge method getSomethingGeneric(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getSomethingGeneric-impl(p0: double, p1: double): DPoint @@ -83,7 +83,7 @@ public final class DSegment { public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: double, p3: double, p4: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean public @org.jetbrains.annotations.NotNull method getP1(): DPoint public synthetic bridge method getP1(): java.lang.Object public @org.jetbrains.annotations.NotNull method getP2(): DPoint @@ -140,7 +140,7 @@ public final class GenericFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public synthetic bridge method getP(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint @@ -173,7 +173,7 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint @@ -2515,7 +2515,7 @@ public final class ReifiedFakeOverrideMFVC { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public @org.jetbrains.annotations.NotNull method getP(): DPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint public @org.jetbrains.annotations.NotNull method getP1(): DPoint diff --git a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.fir.txt b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.fir.txt index 7ac08f07463..8ca93b48bf3 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.fir.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.fir.txt @@ -52,7 +52,7 @@ public final class GenericFakeOverrideMFVC { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP(): XPoint public synthetic bridge method getP(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint @@ -85,7 +85,7 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP(): XPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint public @org.jetbrains.annotations.NotNull method getP1(): XPoint @@ -2412,7 +2412,7 @@ public final class ReifiedFakeOverrideMFVC { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP(): XPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint public @org.jetbrains.annotations.NotNull method getP1(): XPoint @@ -2526,7 +2526,7 @@ public final class XPoint { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public final method getX(): java.lang.Object public final method getY(): java.lang.Object public method hashCode(): int @@ -2552,7 +2552,7 @@ public final class XPointWithInterface { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public final @org.jetbrains.annotations.NotNull method getSomethingGeneric(): XPoint public synthetic bridge method getSomethingGeneric(): java.lang.Object public final static @org.jetbrains.annotations.NotNull method getSomethingGeneric-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint @@ -2588,7 +2588,7 @@ public final class XSegment { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object, p7: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object, p7: java.lang.Object): boolean public final @org.jetbrains.annotations.NotNull method getP1(): XPoint public synthetic bridge method getP1(): java.lang.Object public final @org.jetbrains.annotations.NotNull method getP2(): XPoint diff --git a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt index 5d02bf98d3b..de1c92111f2 100644 --- a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt +++ b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.txt @@ -52,7 +52,7 @@ public final class GenericFakeOverrideMFVC { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP(): XPoint public synthetic bridge method getP(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint @@ -85,7 +85,7 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP(): XPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint public @org.jetbrains.annotations.NotNull method getP1(): XPoint @@ -2412,7 +2412,7 @@ public final class ReifiedFakeOverrideMFVC { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP(): XPoint public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint public @org.jetbrains.annotations.NotNull method getP1(): XPoint @@ -2526,7 +2526,7 @@ public final class XPoint { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public method getX(): java.lang.Object public method getY(): java.lang.Object public method hashCode(): int @@ -2552,7 +2552,7 @@ public final class XPointWithInterface { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getSomethingGeneric(): XPoint public synthetic bridge method getSomethingGeneric(): java.lang.Object public static @org.jetbrains.annotations.NotNull method getSomethingGeneric-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint @@ -2588,7 +2588,7 @@ public final class XSegment { public final static method constructor-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object, p7: java.lang.Object): boolean + public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object, p7: java.lang.Object): boolean public @org.jetbrains.annotations.NotNull method getP1(): XPoint public synthetic bridge method getP1(): java.lang.Object public @org.jetbrains.annotations.NotNull method getP2(): XPoint diff --git a/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt b/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt index 64b8113daa8..a644d185f32 100644 --- a/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt +++ b/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt @@ -9,7 +9,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public method hashCode(): int public static method hashCode-impl(p0: double, p1: double): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/tryExpressions.txt b/compiler/testData/codegen/box/valueClasses/tryExpressions.txt index 3200828bbda..eb2ecb04ed3 100644 --- a/compiler/testData/codegen/box/valueClasses/tryExpressions.txt +++ b/compiler/testData/codegen/box/valueClasses/tryExpressions.txt @@ -9,7 +9,7 @@ public final class DPoint { public final static method constructor-impl(p0: double, p1: double): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: double, p1: double, p2: double, p3: double): boolean + public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean public method hashCode(): int public static method hashCode-impl(p0: double, p1: double): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/box/valueClasses/visibility.txt b/compiler/testData/codegen/box/valueClasses/visibility.txt index 4d3f2a88458..8189433e5f7 100644 --- a/compiler/testData/codegen/box/valueClasses/visibility.txt +++ b/compiler/testData/codegen/box/valueClasses/visibility.txt @@ -39,7 +39,7 @@ public final class Internal { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public final static @org.jetbrains.annotations.NotNull method getT(): Internal public final static method getX(): int public final static method getY(): int @@ -64,7 +64,7 @@ public final class InternalInternal { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -85,7 +85,7 @@ public final class InternalPrivate { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -106,7 +106,7 @@ public final class InternalPublic { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -127,7 +127,7 @@ public final class Private { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -147,7 +147,7 @@ public final class PrivateInternal { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -168,7 +168,7 @@ public final class PrivatePrivate { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -189,7 +189,7 @@ public final class PrivatePublic { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -237,7 +237,7 @@ public final class Public { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -258,7 +258,7 @@ public final class PublicInternal { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -279,7 +279,7 @@ public final class PublicPrivate { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String @@ -300,7 +300,7 @@ public final class PublicPublic { public final static method constructor-impl(p0: int, p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public method hashCode(): int public static method hashCode-impl(p0: int, p1: int): int public @org.jetbrains.annotations.NotNull method toString(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.txt b/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.txt index 573eb9cd59c..2897c20ae00 100644 --- a/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.txt +++ b/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.txt @@ -10,7 +10,7 @@ public final class A { public final static @Ann method constructor-impl(@Ann$Container(value=[Ann, Ann, Ann, Ann]) p0: int, @Ann$Container(value=[Ann, Ann, Ann, Ann]) p1: int): void 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-sUp7gFk(p0: int, p1: int, p2: int, p3: int): boolean + public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean public final static method getValue-impl(p0: int, p1: int, @org.jetbrains.annotations.Nullable p2: java.lang.Object, @org.jetbrains.annotations.NotNull p3: kotlin.reflect.KProperty): int public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getX$annotations(): void public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getY$annotations(): void @@ -69,7 +69,7 @@ public final class B { public final static @Ann method constructor-impl(p0: int, p1: int, @Ann$Container(value=[Ann, Ann, Ann, Ann]) @org.jetbrains.annotations.Nullable p2: A): void public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean public static method equals-impl(p0: int, p1: int, p2: A, p3: java.lang.Object): boolean - public final static method equals-sUp7gFk(p0: int, p1: int, p2: A, p3: int, p4: int, p5: A): boolean + public final static method equals-impl0(p0: int, p1: int, p2: A, p3: int, p4: int, p5: A): boolean public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getX$annotations(): void public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getY$annotations(): void public method hashCode(): int diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt b/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt index c5f5e510e0b..8f361db4277 100644 --- a/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt +++ b/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt @@ -54,7 +54,7 @@ fun equalsChecks12(left: DPoint, right: DPoint) { require(111, left == right.toDPointOrNull()) } -// 1 BIPUSH 100\n {4}DLOAD 0\n {4}DLOAD 2\n {4}DLOAD 4\n {4}DLOAD 6\n {4}INVOKESTATIC .*equals-sUp7gFk.*\n {4}INVOKESTATIC .*require +// 1 BIPUSH 100\n {4}DLOAD 0\n {4}DLOAD 2\n {4}DLOAD 4\n {4}DLOAD 6\n {4}INVOKESTATIC .*equals-impl0.*\n {4}INVOKESTATIC .*require // 1 BIPUSH 101\n {4}DLOAD 0\n {4}DLOAD 2\n {4}.*toObject.*\n {4}DLOAD 4\n {4}DLOAD 6\n {4}.*box-impl.*\n {4}INVOKESTATIC .*Intrinsics.areEqual.*\n {4}INVOKESTATIC .*require // 1 BIPUSH 102\n {4}DLOAD 0\n {4}DLOAD 2\n {4}DLOAD 4\n {4}DLOAD 6\n {4}.*toObject.*\n {4}INVOKESTATIC .*equals-impl .*\n {4}INVOKESTATIC .*require // 1 BIPUSH 103\n {4}DLOAD 0\n {4}DLOAD 2\n {4}.*toObject.*\n {4}DLOAD 4\n {4}DLOAD 6\n {4}.*toObject.*\n {4}INVOKESTATIC .*Intrinsics.areEqual.*\n {4}INVOKESTATIC .*require diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt b/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt index 3204b213690..f39640655b0 100644 --- a/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt +++ b/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt @@ -45,7 +45,7 @@ fun functionWithoutBoxes(x: D, y: D) { // 2 INVOKESTATIC C.hashCode-impl \(IILjava/lang/String;\)I // 1 INVOKESTATIC D.hashCode-impl \(IILjava/lang/String;\)I // 2 public static equals-impl\(IILjava/lang/String;Ljava/lang/Object;\)Z -// 2 public final static equals-sUp7gFk\(IILjava/lang/String;IILjava/lang/String;\)Z +// 2 public final static equals-impl0\(IILjava/lang/String;IILjava/lang/String;\)Z // 1 public final static constructor-impl\(III\)LD; // 2 public final static constructor-impl\(IILjava/lang/String;\)V // 2 INVOKESTATIC D.constructor-impl \(IILjava/lang/String;\)V