From 690762d46c332ee58b8e448eba92a46df0434bdf Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Thu, 6 Sep 2018 17:01:01 +0300 Subject: [PATCH] Inline classes ABI: rename `equals--impl` to `equals-impl0` --- .../jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt | 2 +- .../box/inlineClasses/callSpecializedEqualsViaReflection.kt | 4 ++-- .../inlineClasses/companionObjectInsideInlineClass.txt | 2 +- .../inlineClasses/computablePropertiesInsideInlineClass.txt | 2 +- .../bytecodeListing/inlineClasses/inlineClassConstructors.txt | 2 +- .../inlineClasses/noBridgesForErasedInlineClass.txt | 2 +- .../inlineClasses/shapeOfInlineClassWithPrimitive.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt index ff802a73624..090af4468ef 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineClassDescriptorResolver.kt @@ -19,7 +19,7 @@ object InlineClassDescriptorResolver { @JvmField val UNBOX_METHOD_NAME = Name.identifier("unbox") - private val SPECIALIZED_EQUALS_NAME = Name.identifier("equals--impl") + private val SPECIALIZED_EQUALS_NAME = Name.identifier("equals-impl0") private val BOXING_VALUE_PARAMETER_NAME = Name.identifier("v") diff --git a/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt b/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt index d3d6f926855..b66157c0076 100644 --- a/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt +++ b/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt @@ -10,9 +10,9 @@ inline class Simple(val x: String) { fun box(): String { var s = "" - val name = "equals--impl" + val name = "equals-impl0" val specializedEquals = - Class.forName("Simple\$Erased").getDeclaredMethod("equals--impl", String::class.java, String::class.java) + Class.forName("Simple\$Erased").getDeclaredMethod(name, String::class.java, String::class.java) ?: return "$name not found" try { diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt index 7e812b1ba33..49ecc3957ea 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt @@ -12,7 +12,7 @@ static class Foo$Erased { public final static @org.jetbrains.annotations.NotNull method box(p0: int): Foo public static method constructor(p0: int): int public static method equals(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals--impl(p0: int, p1: int): boolean + public final static method equals-impl0(p0: int, p1: int): boolean public static method hashCode(p0: int): int public final static method inInlineClass(p0: int): void public static @org.jetbrains.annotations.NotNull method toString(p0: int): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt index f1833637ed3..7bda3dc4d89 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt @@ -4,7 +4,7 @@ static class Foo$Erased { public final static @org.jetbrains.annotations.NotNull method box(p0: int): Foo public static method constructor(p0: int): int public static method equals(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals--impl(p0: int, p1: int): boolean + public final static method equals-impl0(p0: int, p1: int): boolean public final static method getAsThis(p0: int): int public final static method getProp(p0: int): int public static method hashCode(p0: int): int diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassConstructors.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassConstructors.txt index fcbdfffea44..dc9c524cba8 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassConstructors.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassConstructors.txt @@ -5,7 +5,7 @@ static class Foo$Erased { public static method constructor(p0: int): int public static method constructor(p0: long): int public static method equals(p0: int, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals--impl(p0: int, p1: int): boolean + public final static method equals-impl0(p0: int, p1: int): boolean public static method hashCode(p0: int): int public static @org.jetbrains.annotations.NotNull method toString(p0: int): java.lang.String } diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt index c9148d51fa3..db9eb693a7f 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt @@ -9,7 +9,7 @@ static class Foo$Erased { public final static @org.jetbrains.annotations.NotNull method box(p0: long): Foo public static method constructor(p0: long): long public static method equals(p0: long, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals--impl(p0: long, p1: long): boolean + public final static method equals-impl0(p0: long, p1: long): boolean public static method foo-1e4ch6lh(p0: long, p1: long): void public static method hashCode(p0: long): int public static @org.jetbrains.annotations.NotNull method toString(p0: long): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt index 8b59c7512fd..2b4bf05f963 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt @@ -5,7 +5,7 @@ static class Foo$Erased { public static method constructor(p0: long): long public final static method empty(p0: long): void public static method equals(p0: long, @org.jetbrains.annotations.Nullable p1: java.lang.Object): boolean - public final static method equals--impl(p0: long, p1: long): boolean + public final static method equals-impl0(p0: long, p1: long): boolean public final static method extension(p0: long, @org.jetbrains.annotations.NotNull p1: java.lang.Object, @org.jetbrains.annotations.NotNull p2: java.lang.String): void public static method hashCode(p0: long): int public final static method param(p0: long, p1: double): void