From 3bdfd811e88c284b61bd6ab4832f9a694bffd348 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 30 Aug 2018 14:33:54 +0300 Subject: [PATCH] Add some new String methods in JDK 11 to built-ins mapping blacklist These three methods are conflicting with existing extensions, thus the behavior might be changed when switching to JDK 11 Probably, it's worth revisiting our strategy here, e.g. by blacklisting all new methods in #KT-24974 Fixed --- .../builtin-classes/newMethods/kotlin.txt | 3 +++ .../newStringMethods.kt | 11 +++++++++++ compiler/testData/mockJDKModified/rt.jar | Bin 1092656 -> 1095530 bytes .../jetbrains/kotlin/test/TestJdkKind.java | 1 + ...tionalBuiltInsMembersSignatureListsTest.kt | 9 +++++++++ ...sticsWithModifiedMockJdkTestGenerated.java | 5 +++++ .../builtins/jvm/JvmBuiltInsSettings.kt | 3 ++- 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 compiler/testData/diagnostics/testWithModifiedMockJdk/newStringMethods.kt diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt index 2bb26a0b6aa..01b1737c826 100644 --- a/compiler/testData/builtin-classes/newMethods/kotlin.txt +++ b/compiler/testData/builtin-classes/newMethods/kotlin.txt @@ -744,6 +744,9 @@ public final class String : kotlin.Comparable, kotlin.CharSequenc public open override /*1*/ fun compareTo(/*0*/ other: kotlin.String): kotlin.Int public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char public final operator fun plus(/*0*/ other: kotlin.Any?): kotlin.String + @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public open fun strip(): kotlin.String! + @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public open fun stripLeading(): kotlin.String! + @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public open fun stripTrailing(): kotlin.String! public open override /*1*/ fun subSequence(/*0*/ startIndex: kotlin.Int, /*1*/ endIndex: kotlin.Int): kotlin.CharSequence public companion object Companion { diff --git a/compiler/testData/diagnostics/testWithModifiedMockJdk/newStringMethods.kt b/compiler/testData/diagnostics/testWithModifiedMockJdk/newStringMethods.kt new file mode 100644 index 00000000000..53a19e64041 --- /dev/null +++ b/compiler/testData/diagnostics/testWithModifiedMockJdk/newStringMethods.kt @@ -0,0 +1,11 @@ +// !CHECK_TYPE +// SKIP_TXT + +fun foo(s: String) { + s.isBlank() + s.lines().checkType { _>() } + s.repeat(1) + + // We don't have `strip` extension, so leave it for a while in gray list + s.strip() +} diff --git a/compiler/testData/mockJDKModified/rt.jar b/compiler/testData/mockJDKModified/rt.jar index 64d380ad782ed324ca1a7be5b823cde52f9cac85..1241c3339a6aed482ef4eeddea595f25dbeccaa5 100644 GIT binary patch delta 13881 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 delta 11016 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 QKs;G`^M-yL4e}QFe^4)Xn*aa+ diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestJdkKind.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestJdkKind.java index e29fcd46cc1..35d3e901642 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestJdkKind.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/TestJdkKind.java @@ -20,6 +20,7 @@ public enum TestJdkKind { MOCK_JDK, // Differs from common mock JDK only by one additional 'nonExistingMethod' in Collection and constructor from Double in Throwable // It's needed to test the way we load additional built-ins members that neither in black nor white lists + // Also, now it contains new methods in java.lang.String introduced in JDK 11 MODIFIED_MOCK_JDK, // JDK found at $JDK_16 FULL_JDK_6, diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt index 718ff922fcf..63a566015c0 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt @@ -57,8 +57,13 @@ class AdditionalBuiltInsMembersSignatureListsTest : KotlinTestWithEnvironment() val scope = classDescriptor.unsubstitutedMemberScope + val lateJdkSignatures = LATE_JDK_SIGNATURES[internalName] ?: emptySet() + jvmDescriptors.forEach { jvmDescriptor -> + + if (jvmDescriptor in lateJdkSignatures) return@forEach + val stringName = jvmDescriptor.split("(")[0] val functions = if (stringName == "") @@ -72,4 +77,8 @@ class AdditionalBuiltInsMembersSignatureListsTest : KotlinTestWithEnvironment() } } } + + private val LATE_JDK_SIGNATURES = mapOf( + "java/lang/String" to setOf("isBlank()Z", "lines()Ljava/util/stream/Stream;", "repeat(I)Ljava/lang/String;") + ) } diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/DiagnosticsWithModifiedMockJdkTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/DiagnosticsWithModifiedMockJdkTestGenerated.java index 30d3f488b6a..37bb8ca0111 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/DiagnosticsWithModifiedMockJdkTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/DiagnosticsWithModifiedMockJdkTestGenerated.java @@ -29,6 +29,11 @@ public class DiagnosticsWithModifiedMockJdkTestGenerated extends AbstractDiagnos KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testWithModifiedMockJdk"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } + @TestMetadata("newStringMethods.kt") + public void testNewStringMethods() throws Exception { + runTest("compiler/testData/diagnostics/testWithModifiedMockJdk/newStringMethods.kt"); + } + @TestMetadata("notConsideredMethod.kt") public void testNotConsideredMethod() throws Exception { runTest("compiler/testData/diagnostics/testWithModifiedMockJdk/notConsideredMethod.kt"); diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt index 7fb1f6537e0..4af1c60c296 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt @@ -371,7 +371,8 @@ open class JvmBuiltInsSettings( "startsWith(Ljava/lang/String;I)Z", "startsWith(Ljava/lang/String;)Z", "substring(II)Ljava/lang/String;", "substring(I)Ljava/lang/String;", "toCharArray()[C", "toLowerCase()Ljava/lang/String;", "toLowerCase(Ljava/util/Locale;)Ljava/lang/String;", "toUpperCase()Ljava/lang/String;", - "toUpperCase(Ljava/util/Locale;)Ljava/lang/String;", "trim()Ljava/lang/String;" + "toUpperCase(Ljava/util/Locale;)Ljava/lang/String;", "trim()Ljava/lang/String;", + "isBlank()Z", "lines()Ljava/util/stream/Stream;", "repeat(I)Ljava/lang/String;" ) + inJavaLang("Double", "isInfinite()Z", "isNaN()Z") +