diff --git a/compiler/testData/builtin-classes/java6/kotlin.txt b/compiler/testData/builtin-classes/java6/kotlin.txt index 957a9d5fe3b..037be8e43ba 100644 --- a/compiler/testData/builtin-classes/java6/kotlin.txt +++ b/compiler/testData/builtin-classes/java6/kotlin.txt @@ -209,8 +209,6 @@ public final enum class DeprecationLevel : kotlin.Enum public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.DeprecationLevel): kotlin.Int - protected/*protected and package*/ final override /*1*/ /*fake_override*/ fun finalize(): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel @@ -301,8 +299,6 @@ public abstract class Enum> : kotlin.Comparable, jav public final fun (): kotlin.Int protected final fun clone(): kotlin.Any public final override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int - protected/*protected and package*/ final fun finalize(): kotlin.Unit - public final fun getDeclaringClass(): java.lang.Class! public companion object Companion { /*primary*/ private constructor Companion() diff --git a/compiler/testData/builtin-classes/java8/kotlin-collections.txt b/compiler/testData/builtin-classes/java8/kotlin-collections.txt index af61f1ddbe6..48fec5eec9e 100644 --- a/compiler/testData/builtin-classes/java8/kotlin-collections.txt +++ b/compiler/testData/builtin-classes/java8/kotlin-collections.txt @@ -193,7 +193,6 @@ public interface MutableList : kotlin.collections.List, kotlin.colle public open fun replaceAll(/*0*/ p0: java.util.function.UnaryOperator!): kotlin.Unit public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public abstract operator fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E - public open fun sort(/*0*/ p0: java.util.Comparator!): kotlin.Unit public open override /*2*/ /*fake_override*/ fun spliterator(): java.util.Spliterator! public open override /*2*/ /*fake_override*/ fun stream(): java.util.stream.Stream! public abstract override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList diff --git a/compiler/testData/builtin-classes/java8/kotlin.txt b/compiler/testData/builtin-classes/java8/kotlin.txt index 97171362b37..2e183e3ec6b 100644 --- a/compiler/testData/builtin-classes/java8/kotlin.txt +++ b/compiler/testData/builtin-classes/java8/kotlin.txt @@ -211,8 +211,6 @@ public final enum class DeprecationLevel : kotlin.Enum public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.DeprecationLevel): kotlin.Int - protected/*protected and package*/ final override /*1*/ /*fake_override*/ fun finalize(): kotlin.Unit - public final override /*1*/ /*fake_override*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel @@ -303,8 +301,6 @@ public abstract class Enum> : kotlin.Comparable, jav public final fun (): kotlin.Int protected final fun clone(): kotlin.Any public final override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int - protected/*protected and package*/ final fun finalize(): kotlin.Unit - public final fun getDeclaringClass(): java.lang.Class! public companion object Companion { /*primary*/ private constructor Companion() diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsAdditionalClassPartsProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsAdditionalClassPartsProvider.kt index c509e44c08a..bd3f5900837 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsAdditionalClassPartsProvider.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsAdditionalClassPartsProvider.kt @@ -237,6 +237,8 @@ open class JvmBuiltInsAdditionalClassPartsProvider( "Collection", "toArray()[Ljava/lang/Object;", "toArray([Ljava/lang/Object;)[Ljava/lang/Object;" ) + + inJavaUtil("List", "sort(Ljava/util/Comparator;)V") + + inJavaLang("String", "codePointAt(I)I", "codePointBefore(I)I", "codePointCount(II)I", "compareToIgnoreCase(Ljava/lang/String;)I", "concat(Ljava/lang/String;)Ljava/lang/String;", "contains(Ljava/lang/CharSequence;)Z", @@ -259,7 +261,9 @@ open class JvmBuiltInsAdditionalClassPartsProvider( inJavaLang("Double", "isInfinite()Z", "isNaN()Z") + inJavaLang("Float", "isInfinite()Z", "isNaN()Z") + - inJavaUtil("Collection", "toArray([Ljava/lang/Object;)[Ljava/lang/Object;", "toArray()[Ljava/lang/Object;") + inJavaUtil("Collection", "toArray([Ljava/lang/Object;)[Ljava/lang/Object;", "toArray()[Ljava/lang/Object;") + + + inJavaLang("Enum", "getDeclaringClass()Ljava/lang/Class;", "finalize()V") } private fun buildPrimitiveValueMethodsSet(): Set = @@ -273,8 +277,7 @@ open class JvmBuiltInsAdditionalClassPartsProvider( signatures { inJavaUtil("Collection", "removeIf(Ljava/util/function/Predicate;)Z") + - inJavaUtil("List", - "sort(Ljava/util/Comparator;)V", "replaceAll(Ljava/util/function/UnaryOperator;)V") + + inJavaUtil("List", "replaceAll(Ljava/util/function/UnaryOperator;)V") + inJavaUtil("Map", "computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;",