diff --git a/compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfUnsigned.kt b/compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfUnsigned.kt index a873b47654a..f2bf0cd0a99 100644 --- a/compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfUnsigned.kt +++ b/compiler/testData/codegen/box/arrays/arraysOfInlineClass/accessArrayOfUnsigned.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR val xs = Array(2) { 42u } diff --git a/compiler/testData/codegen/box/arrays/arraysOfInlineClass/arrayOfInlineClassOfArrayOfInlineClass.kt b/compiler/testData/codegen/box/arrays/arraysOfInlineClass/arrayOfInlineClassOfArrayOfInlineClass.kt index 679f2534759..94358f7bb89 100644 --- a/compiler/testData/codegen/box/arrays/arraysOfInlineClass/arrayOfInlineClassOfArrayOfInlineClass.kt +++ b/compiler/testData/codegen/box/arrays/arraysOfInlineClass/arrayOfInlineClassOfArrayOfInlineClass.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +InlineClasses -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR inline class Data(val data: Array) diff --git a/compiler/testData/codegen/box/unsignedTypes/boxConstValOfUnsignedType.kt b/compiler/testData/codegen/box/unsignedTypes/boxConstValOfUnsignedType.kt index 09102834186..d9761cea357 100644 --- a/compiler/testData/codegen/box/unsignedTypes/boxConstValOfUnsignedType.kt +++ b/compiler/testData/codegen/box/unsignedTypes/boxConstValOfUnsignedType.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR const val maxUByte: UByte = 0xFFu diff --git a/compiler/testData/codegen/box/unsignedTypes/boxedUnsignedEqualsZero.kt b/compiler/testData/codegen/box/unsignedTypes/boxedUnsignedEqualsZero.kt index 2d6d2fa3aa9..3ee274c472f 100644 --- a/compiler/testData/codegen/box/unsignedTypes/boxedUnsignedEqualsZero.kt +++ b/compiler/testData/codegen/box/unsignedTypes/boxedUnsignedEqualsZero.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun isZeroUInt(n: UInt?) = n!! == 0U diff --git a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt index fbe82a8e427..287d9cbbc1d 100644 --- a/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt +++ b/compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun box(): String { diff --git a/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt b/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt index 5bd2eae26cc..823d9303634 100644 --- a/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt +++ b/compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// WITH_UNSIGNED +// WITH_REFLECT // TARGET_BACKEND: JVM @file:Suppress("INVISIBLE_MEMBER") diff --git a/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt b/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt index 007916a9145..0f7696db5d3 100644 --- a/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt +++ b/compiler/testData/codegen/box/unsignedTypes/forEachIndexedInListOfUInts.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// WITH_UNSIGNED +// WITH_RUNTIME fun box(): String { val a = listOf(1u, 2u, 3u) diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt index ab642d56920..575420fa3ca 100644 --- a/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt +++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverArrayOfUnsignedValues.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JS_IR diff --git a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt index f1c7130cdbb..f08d994324e 100644 --- a/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt +++ b/compiler/testData/codegen/box/unsignedTypes/iterateOverListOfBoxedUnsignedValues.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun box(): String { diff --git a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt index d6f87686d16..1a5fd1669d3 100644 --- a/compiler/testData/codegen/box/unsignedTypes/kt25784.kt +++ b/compiler/testData/codegen/box/unsignedTypes/kt25784.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR import kotlin.reflect.KProperty diff --git a/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt b/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt index 3e9b2775d88..6b45a773bb0 100644 --- a/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt +++ b/compiler/testData/codegen/box/unsignedTypes/literalEqualsNullableUnsigned.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun isZeroUInt(n: UInt?) = 0U == n diff --git a/compiler/testData/codegen/box/unsignedTypes/nullableUnsignedEqualsLiteral.kt b/compiler/testData/codegen/box/unsignedTypes/nullableUnsignedEqualsLiteral.kt index fe8c1f5a98c..b0094ddfa1f 100644 --- a/compiler/testData/codegen/box/unsignedTypes/nullableUnsignedEqualsLiteral.kt +++ b/compiler/testData/codegen/box/unsignedTypes/nullableUnsignedEqualsLiteral.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun isZeroUInt(n: UInt?) = n == 0U diff --git a/compiler/testData/codegen/box/unsignedTypes/signedToUnsignedLiteralConversion.kt b/compiler/testData/codegen/box/unsignedTypes/signedToUnsignedLiteralConversion.kt index 9e952666f02..03a15afa885 100644 --- a/compiler/testData/codegen/box/unsignedTypes/signedToUnsignedLiteralConversion.kt +++ b/compiler/testData/codegen/box/unsignedTypes/signedToUnsignedLiteralConversion.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JS_IR, JVM_IR @file:Suppress("SIGNED_CONSTANT_CONVERTED_TO_UNSIGNED") diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsForMaxLongValue.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsForMaxLongValue.kt index 54f328847ff..4606c6a5e55 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsForMaxLongValue.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsForMaxLongValue.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun box(): String { diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsWithSignedOverflow.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsWithSignedOverflow.kt index 07a36fea49a..3bdfd6d64f4 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsWithSignedOverflow.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsWithSignedOverflow.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR fun box(): String { diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt index 8d6f15a738e..2ee4c8fdd02 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedTypePrefixIncrementDecrementBoxing.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_REFLECT // IGNORE_BACKEND: JVM_IR fun prefixDecrementUByteLocal(): Any? { diff --git a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt index 6008d89a6f9..cfc0af7bb71 100644 --- a/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt +++ b/compiler/testData/codegen/box/unsignedTypes/unsignedTypeValuesInsideStringTemplates.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JVM_IR const val MAX_BYTE: UByte = 0xFFu diff --git a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt index 36e31971ea0..676e590ee4f 100644 --- a/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt +++ b/compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: JVM_IR -// WITH_UNSIGNED +// WITH_RUNTIME // IGNORE_BACKEND: JS_IR fun uint(vararg us: UInt): UIntArray = us diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt index 696f301c451..9cf94a72cef 100644 --- a/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt +++ b/compiler/testData/codegen/bytecodeText/inlineClasses/noBoxingOperationsOnNonTrivialSpread.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME fun uint(vararg us: UInt): UIntArray = us diff --git a/compiler/testData/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt b/compiler/testData/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt index 0e16ed4a9ea..d82e78d74d8 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt @@ -1,5 +1,5 @@ // IGNORE_BACKEND: NATIVE -// WITH_UNSIGNED +// WITH_RUNTIME // FILE: A.kt diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt index b886fb1ac4e..752f30a140b 100644 --- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt +++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME // FILE: signedToUnsignedConversions_annotation.kt diff --git a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt index bac0d082589..eb3eb382aec 100644 --- a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt +++ b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME val testSimpleUIntLiteral = 1u diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt index 20ed151a65a..c447c401935 100644 --- a/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt +++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/WithUnsignedTypeParameters.kt @@ -1,4 +1,4 @@ -// WITH_UNSIGNED +// WITH_RUNTIME package test diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithUnsignedTypes.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithUnsignedTypes.kt index 1baf29522af..b6e5a187e3e 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithUnsignedTypes.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithUnsignedTypes.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind abstract class AbstractDiagnosticsWithUnsignedTypes : AbstractDiagnosticsTest() { override fun getConfigurationKind(): ConfigurationKind { - return ConfigurationKind.WITH_UNSIGNED_TYPES + return ConfigurationKind.NO_KOTLIN_REFLECT } override fun defaultLanguageVersionSettings(): LanguageVersionSettings = diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 30e1bda9ebe..c101157d489 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -198,12 +198,6 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { Map directives = KotlinTestUtils.parseDirectives(testFile.content); - if (InTextDirectivesUtils.isDirectiveDefined(testFile.content, "WITH_UNSIGNED")) { - assertDirectivesToNull(explicitLanguageVersionSettings, explicitLanguageVersion); - explicitLanguageVersion = LanguageVersion.KOTLIN_1_3; - directives.put(API_VERSION_DIRECTIVE, ApiVersion.KOTLIN_1_3.getVersionString()); - } - LanguageVersionSettings fileLanguageVersionSettings = parseLanguageVersionSettings(directives); if (fileLanguageVersionSettings != null) { assertDirectivesToNull(explicitLanguageVersionSettings, null); @@ -422,18 +416,12 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { if (configurationKind.getWithReflection() && configurationKind.getWithCoroutines()) { classLoader = ForTestCompileRuntime.reflectAndCoroutinesJarClassLoader(); } - else if (configurationKind.getWithUnsignedTypes() && configurationKind.getWithReflection()) { - classLoader = ForTestCompileRuntime.reflectAndUnsignedTypesJarClassLoader(); - } else if (configurationKind.getWithReflection()) { classLoader = ForTestCompileRuntime.runtimeAndReflectJarClassLoader(); } else if (configurationKind.getWithCoroutines()) { classLoader = ForTestCompileRuntime.runtimeAndCoroutinesJarClassLoader(); } - else if (configurationKind.getWithUnsignedTypes()) { - classLoader = ForTestCompileRuntime.runtimeAndUnsignedTypesJarClassLoader(); - } else { classLoader = ForTestCompileRuntime.runtimeJarClassLoader(); } @@ -700,9 +688,6 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { if (configurationKind.getWithCoroutines()) { javaClasspath.add(ForTestCompileRuntime.coroutinesJarForTests().getPath()); } - if (configurationKind.getWithUnsignedTypes()) { - javaClasspath.add(ForTestCompileRuntime.unsignedTypesJarForTests().getPath()); - } javaClassesOutputDirectory = CodegenTestUtil.compileJava( findJavaSourcesInDirectory(javaSourceDir), javaClasspath, javacOptions @@ -715,7 +700,6 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { boolean addRuntime = false; boolean addReflect = false; boolean addCoroutines = false; - boolean addUnsignedTypes = false; for (TestFile file : files) { if (InTextDirectivesUtils.isDirectiveDefined(file.content, "COMMON_COROUTINES_TEST") || InTextDirectivesUtils.isDirectiveDefined(file.content, "!LANGUAGE: +ReleaseCoroutines") || @@ -728,16 +712,11 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_REFLECT")) { addReflect = true; } - if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_UNSIGNED")) { - addUnsignedTypes = true; - } } - return (addReflect && addCoroutines && addUnsignedTypes) ? ConfigurationKind.ALL : - (addReflect && addCoroutines) ? ConfigurationKind.WITH_COROUTINES_AND_REFLECT : + return (addReflect && addCoroutines) ? ConfigurationKind.ALL : addReflect ? ConfigurationKind.WITH_REFLECT : addCoroutines ? ConfigurationKind.WITH_COROUTINES : - addUnsignedTypes ? ConfigurationKind.WITH_UNSIGNED_TYPES : addRuntime ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.JDK_ONLY; } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java index 93aa9d021c5..3986c958749 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java @@ -138,29 +138,6 @@ public class ForTestCompileRuntime { return loader; } - @NotNull - public static synchronized ClassLoader runtimeAndUnsignedTypesJarClassLoader() { - ClassLoader loader = unsignedTypesJarClassLoader.get(); - if (loader == null) { - loader = createClassLoader(runtimeJarForTests(), unsignedTypesJarForTests(), scriptRuntimeJarForTests(), kotlinTestJarForTests()); - unsignedTypesJarClassLoader = new SoftReference<>(loader); - } - return loader; - } - - @NotNull - public static synchronized ClassLoader reflectAndUnsignedTypesJarClassLoader() { - ClassLoader loader = unsignedTypesAndReflectJarClassLoader.get(); - if (loader == null) { - loader = createClassLoader( - runtimeJarForTests(), reflectJarForTests(), unsignedTypesJarForTests(), - scriptRuntimeJarForTests(), kotlinTestJarForTests() - ); - unsignedTypesAndReflectJarClassLoader = new SoftReference<>(loader); - } - return loader; - } - @NotNull public static synchronized ClassLoader reflectAndCoroutinesJarClassLoader() { ClassLoader loader = coroutinesAndReflectJarClassLoader.get(); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt index 99b57560cbc..358e54402b8 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt @@ -55,7 +55,6 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { val javacOptions = ArrayList(0) var addRuntime = false var addReflect = false - var addUnsigned = false for (file in files) { if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_RUNTIME")) { addRuntime = true @@ -63,9 +62,6 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_REFLECT")) { addReflect = true } - if (InTextDirectivesUtils.isDirectiveDefined(file.content, "WITH_UNSIGNED")) { - addUnsigned = true - } javacOptions.addAll(InTextDirectivesUtils.findListWithPrefixes(file.content, "// JAVAC_OPTIONS:")) } @@ -73,7 +69,6 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { val configurationKind = when { addReflect -> ConfigurationKind.ALL addRuntime -> ConfigurationKind.NO_KOTLIN_REFLECT - addUnsigned -> ConfigurationKind.WITH_UNSIGNED_TYPES else -> ConfigurationKind.JDK_ONLY } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index d43d12baf16..cd187f042c2 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -151,14 +151,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { Map directives = KotlinTestUtils.parseDirectives(content); LanguageVersionSettings languageVersionSettings = CompilerTestLanguageVersionSettingsKt.parseLanguageVersionSettings(directives); if (languageVersionSettings == null) { - if (InTextDirectivesUtils.isDirectiveDefined(content, "WITH_UNSIGNED")) { - languageVersionSettings = new CompilerTestLanguageVersionSettings( - emptyMap(), ApiVersion.KOTLIN_1_3, LanguageVersion.KOTLIN_1_3, emptyMap() - ); - } - else { - languageVersionSettings = CompilerTestLanguageVersionSettingsKt.defaultLanguageVersionSettings(); - } + languageVersionSettings = CompilerTestLanguageVersionSettingsKt.defaultLanguageVersionSettings(); } CommonConfigurationKeysKt.setLanguageVersionSettings(configuration, languageVersionSettings); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt index b6cb4895b27..61949e6dae4 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt @@ -9,8 +9,7 @@ enum class ConfigurationKind( val withRuntime: Boolean = false, val withMockRuntime: Boolean = false, val withReflection: Boolean = false, - val withCoroutines: Boolean = false, - val withUnsignedTypes: Boolean = false + val withCoroutines: Boolean = false ) { /** JDK without any kotlin runtime */ JDK_NO_RUNTIME(), @@ -20,12 +19,8 @@ enum class ConfigurationKind( NO_KOTLIN_REFLECT(withRuntime = true), /** JDK + kotlin runtime + coroutines */ WITH_COROUTINES(withCoroutines = true, withRuntime = true), - /** JDK + kotlin runtime + unsigned types */ - WITH_UNSIGNED_TYPES(withUnsignedTypes = true, withRuntime = true, withReflection = true), /** JDK + kotlin runtime + kotlin reflection */ WITH_REFLECT(withRuntime = true, withReflection = true), /** JDK + kotlin runtime + kotlin reflection + coroutines */ - WITH_COROUTINES_AND_REFLECT(withRuntime = true, withReflection = true, withCoroutines = true), - /** JDK + kotlin runtime + kotlin reflection + coroutines + unsigned types */ - ALL(withRuntime = true, withReflection = true, withCoroutines = true, withUnsignedTypes = true) + ALL(withRuntime = true, withReflection = true, withCoroutines = true) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 3fb17d56f5f..00f77bdb22c 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -585,9 +585,6 @@ public class KotlinTestUtils { if (configurationKind.getWithCoroutines()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.coroutinesJarForTests()); } - if (configurationKind.getWithUnsignedTypes()) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.unsignedTypesJarForTests()); - } if (configurationKind.getWithRuntime()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.scriptRuntimeJarForTests()); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 index 26ba811b012..21bf6a9465b 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 @@ -580,9 +580,6 @@ public class KotlinTestUtils { if (configurationKind.getWithCoroutines()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.coroutinesJarForTests()); } - if (configurationKind.getWithUnsignedTypes()) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.unsignedTypesJarForTests()); - } if (configurationKind.getWithRuntime()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.scriptRuntimeJarForTests()); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 index 8aed5108a59..b6c1023160d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 @@ -580,9 +580,6 @@ public class KotlinTestUtils { if (configurationKind.getWithCoroutines()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.coroutinesJarForTests()); } - if (configurationKind.getWithUnsignedTypes()) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.unsignedTypesJarForTests()); - } if (configurationKind.getWithRuntime()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.scriptRuntimeJarForTests()); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 index dcd54cab436..11197abf954 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 @@ -580,9 +580,6 @@ public class KotlinTestUtils { if (configurationKind.getWithCoroutines()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.coroutinesJarForTests()); } - if (configurationKind.getWithUnsignedTypes()) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.unsignedTypesJarForTests()); - } if (configurationKind.getWithRuntime()) { JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.scriptRuntimeJarForTests());