From 3593e45b97ebeba6648240ec1f25769934aa0131 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 16 Nov 2021 10:09:44 +0100 Subject: [PATCH] Rename 'RELEASE' fields into 'JDK_RELEASE' --- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 2 +- compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt | 4 ++-- .../src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java | 2 +- .../kotlin/test/directives/LanguageSettingsDirectives.kt | 2 +- .../testsWithJava11/releaseFlag/byteBuffer/byteBuffer_10.kt | 2 +- .../testsWithJava11/releaseFlag/byteBuffer/byteBuffer_11.kt | 2 +- .../testsWithJava11/releaseFlag/byteBuffer/byteBuffer_6.kt | 2 +- .../testsWithJava11/releaseFlag/byteBuffer/byteBuffer_8.kt | 2 +- .../testsWithJava11/releaseFlag/byteBuffer/byteBuffer_9.kt | 2 +- .../testsWithJava11/releaseFlag/reflective/reflective_10.kt | 2 +- .../testsWithJava11/releaseFlag/reflective/reflective_11.kt | 2 +- .../testsWithJava11/releaseFlag/reflective/reflective_6.kt | 2 +- .../testsWithJava11/releaseFlag/reflective/reflective_8.kt | 2 +- .../testsWithJava11/releaseFlag/reflective/reflective_9.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_10.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_11.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_12.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_13.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_14.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_15.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_16.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_17.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_8.kt | 2 +- .../testsWithJava17/releaseFlag/byteBuffer/byteBuffer_9.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_10.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_11.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_12.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_13.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_14.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_15.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_16.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_17.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_8.kt | 2 +- .../testsWithJava17/releaseFlag/constable/constable_9.kt | 2 +- .../test/services/configuration/JvmEnvironmentConfigurator.kt | 4 ++-- 35 files changed, 37 insertions(+), 37 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 3cc4677adf6..98d46a622c9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -239,7 +239,7 @@ class KotlinCoreEnvironment private constructor( val javaFileManager = ServiceManager.getService(project, CoreJavaFileManager::class.java) as KotlinCliJavaFileManagerImpl val jdkHome = configuration.get(JVMConfigurationKeys.JDK_HOME) - val releaseTarget = configuration.get(JVMConfigurationKeys.RELEASE, 0) + val releaseTarget = configuration.get(JVMConfigurationKeys.JDK_RELEASE, 0) val javaModuleFinder = CliJavaModuleFinder( jdkHome, messageCollector, diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt index a64204b552a..74765813345 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt @@ -45,7 +45,7 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu } else { //don't use release flag if it equals to compilation JDK version if (value != getJavaVersion() || arguments.jdkHome != null) { - put(JVMConfigurationKeys.RELEASE, value) + put(JVMConfigurationKeys.JDK_RELEASE, value) } if (jvmTargetArg != null && jvmTargetArg != releaseTargetArg) { messageCollector.report( @@ -185,7 +185,7 @@ fun CompilerConfiguration.configureExplicitContentRoots(arguments: K2JVMCompiler } fun CompilerConfiguration.configureStandardLibs(paths: KotlinPaths?, arguments: K2JVMCompilerArguments) { - val releaseFlagValue = this.get(JVMConfigurationKeys.RELEASE, 0) + val releaseFlagValue = this.get(JVMConfigurationKeys.JDK_RELEASE, 0) val isModularJava = isModularJava() && (releaseFlagValue <= 0 || releaseFlagValue >= 9) fun addRoot(moduleName: String, libraryName: String, getLibrary: (KotlinPaths) -> File, noLibraryArgument: String) { diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java index 5b1ffab037d..8a1708a53c9 100644 --- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java +++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java @@ -106,7 +106,7 @@ public class JVMConfigurationKeys { public static final CompilerConfigurationKey STRING_CONCAT = CompilerConfigurationKey.create("Specifies string concatenation scheme"); - public static final CompilerConfigurationKey RELEASE = + public static final CompilerConfigurationKey JDK_RELEASE = CompilerConfigurationKey.create("Specifies JDK API version"); public static final CompilerConfigurationKey SAM_CONVERSIONS = diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt index 4127e8c6e9d..7d16b13aeee 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt @@ -59,7 +59,7 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() { additionalParser = JvmDefaultMode.Companion::fromStringOrNull ) - val RELEASE by valueDirective( + val JDK_RELEASE by valueDirective( description = "Configures corresponding release flag", parser = Integer::valueOf ) diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_10.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_10.kt index 4a792bebdcb..10e6081c3ff 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_10.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_10.kt @@ -1,4 +1,4 @@ -// RELEASE: 10 +// JDK_RELEASE: 10 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_11.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_11.kt index 6b0536a38e4..86ab6951393 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_11.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_11.kt @@ -1,4 +1,4 @@ -// RELEASE: 11 +// JDK_RELEASE: 11 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_6.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_6.kt index a1a67298dc4..ac21e03d8e0 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_6.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_6.kt @@ -1,4 +1,4 @@ -// RELEASE: 6 +// JDK_RELEASE: 6 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/Buffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/Buffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_8.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_8.kt index 5c6c11a403b..213828f678b 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_8.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_8.kt @@ -1,4 +1,4 @@ -// RELEASE: 8 +// JDK_RELEASE: 8 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/Buffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/Buffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_9.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_9.kt index 97b7561871a..9ff19cfaf7e 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_9.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/byteBuffer/byteBuffer_9.kt @@ -1,4 +1,4 @@ -// RELEASE: 9 +// JDK_RELEASE: 9 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_10.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_10.kt index 7e6ef7d667a..9ef0d31b97b 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_10.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_10.kt @@ -1,4 +1,4 @@ -// RELEASE: 10 +// JDK_RELEASE: 10 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/ReflectiveOperationException // 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_11.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_11.kt index 26892e99f80..a376c9d82c8 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_11.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_11.kt @@ -1,4 +1,4 @@ -// RELEASE: 11 +// JDK_RELEASE: 11 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/ReflectiveOperationException // 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_6.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_6.kt index 8f80dabc23a..104fc05ab40 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_6.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_6.kt @@ -1,4 +1,4 @@ -// RELEASE: 6 +// JDK_RELEASE: 6 // CHECK_BYTECODE_TEXT // 0 CHECKCAST java/lang/ReflectiveOperationException // 0 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_8.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_8.kt index 0bb357d3f20..8ba182b56d2 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_8.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_8.kt @@ -1,4 +1,4 @@ -// RELEASE: 8 +// JDK_RELEASE: 8 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/ReflectiveOperationException // 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_9.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_9.kt index c21d17bee66..1b86efc364e 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_9.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava11/releaseFlag/reflective/reflective_9.kt @@ -1,4 +1,4 @@ -// RELEASE: 9 +// JDK_RELEASE: 9 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/ReflectiveOperationException // 1 LOCALVARIABLE reflective Ljava/lang/ReflectiveOperationException; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_10.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_10.kt index 4a792bebdcb..10e6081c3ff 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_10.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_10.kt @@ -1,4 +1,4 @@ -// RELEASE: 10 +// JDK_RELEASE: 10 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_11.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_11.kt index 6b0536a38e4..86ab6951393 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_11.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_11.kt @@ -1,4 +1,4 @@ -// RELEASE: 11 +// JDK_RELEASE: 11 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_12.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_12.kt index 650f439c666..0b6f83365f2 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_12.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_12.kt @@ -1,4 +1,4 @@ -// RELEASE: 12 +// JDK_RELEASE: 12 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_13.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_13.kt index 435c43b66a2..7a9b7a13bf1 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_13.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_13.kt @@ -1,4 +1,4 @@ -// RELEASE: 13 +// JDK_RELEASE: 13 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_14.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_14.kt index a2ac9a1533e..0e86ac84f91 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_14.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_14.kt @@ -1,4 +1,4 @@ -// RELEASE: 14 +// JDK_RELEASE: 14 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_15.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_15.kt index 251de0fde31..7f364a4c1f5 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_15.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_15.kt @@ -1,4 +1,4 @@ -// RELEASE: 15 +// JDK_RELEASE: 15 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_16.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_16.kt index e4296a105ab..05e73d5f41d 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_16.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_16.kt @@ -1,4 +1,4 @@ -// RELEASE: 16 +// JDK_RELEASE: 16 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_17.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_17.kt index 6d837663736..1bfb73eeb76 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_17.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_17.kt @@ -1,4 +1,4 @@ -// RELEASE: 17 +// JDK_RELEASE: 17 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_8.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_8.kt index 5c6c11a403b..213828f678b 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_8.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_8.kt @@ -1,4 +1,4 @@ -// RELEASE: 8 +// JDK_RELEASE: 8 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/Buffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/Buffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_9.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_9.kt index 97b7561871a..9ff19cfaf7e 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_9.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/byteBuffer/byteBuffer_9.kt @@ -1,4 +1,4 @@ -// RELEASE: 9 +// JDK_RELEASE: 9 // CHECK_BYTECODE_TEXT // 1 public final static clear\(Ljava/nio/ByteBuffer;\)Ljava/nio/ByteBuffer; // 1 INVOKEVIRTUAL java/nio/ByteBuffer.clear \(\)Ljava/nio/ByteBuffer; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_10.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_10.kt index ddebb715c47..8b25003ae42 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_10.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_10.kt @@ -1,4 +1,4 @@ -// RELEASE: 10 +// JDK_RELEASE: 10 // CHECK_BYTECODE_TEXT // 0 CHECKCAST java/lang/constant/Constable // 0 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_11.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_11.kt index b21779916ad..0f12e13a82f 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_11.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_11.kt @@ -1,4 +1,4 @@ -// RELEASE: 11 +// JDK_RELEASE: 11 // CHECK_BYTECODE_TEXT // 0 CHECKCAST java/lang/constant/Constable // 0 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_12.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_12.kt index 45c0d1912d4..a853825f3ea 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_12.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_12.kt @@ -1,4 +1,4 @@ -// RELEASE: 12 +// JDK_RELEASE: 12 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/constant/Constable // 1 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_13.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_13.kt index 210e0283273..c602895b3b4 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_13.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_13.kt @@ -1,4 +1,4 @@ -// RELEASE: 13 +// JDK_RELEASE: 13 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/constant/Constable // 1 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_14.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_14.kt index d515cf58b0f..4a5d1567494 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_14.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_14.kt @@ -1,4 +1,4 @@ -// RELEASE: 14 +// JDK_RELEASE: 14 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/constant/Constable // 1 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_15.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_15.kt index 87f23c16e28..804eb3dc2e3 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_15.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_15.kt @@ -1,4 +1,4 @@ -// RELEASE: 15 +// JDK_RELEASE: 15 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/constant/Constable // 1 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_16.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_16.kt index 13262f045d3..77d7b007cdd 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_16.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_16.kt @@ -1,4 +1,4 @@ -// RELEASE: 16 +// JDK_RELEASE: 16 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/constant/Constable // 1 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_17.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_17.kt index 0c383ad24f2..b2fc58442f2 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_17.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_17.kt @@ -1,4 +1,4 @@ -// RELEASE: 17 +// JDK_RELEASE: 17 // CHECK_BYTECODE_TEXT // 2 CHECKCAST java/lang/constant/Constable // 1 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_8.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_8.kt index 6a67a55e086..20d3b6052bf 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_8.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_8.kt @@ -1,4 +1,4 @@ -// RELEASE: 8 +// JDK_RELEASE: 8 // CHECK_BYTECODE_TEXT // 0 CHECKCAST java/lang/constant/Constable // 0 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_9.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_9.kt index de8d2efd8a5..4dd07cfbebc 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_9.kt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/releaseFlag/constable/constable_9.kt @@ -1,4 +1,4 @@ -// RELEASE: 9 +// JDK_RELEASE: 9 // CHECK_BYTECODE_TEXT // 0 CHECKCAST java/lang/constant/Constable // 0 LOCALVARIABLE constable Ljava/lang/constant/Constable; diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt index d06c61df54f..523cfda70f4 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.ENABLE_JV import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_OPTIMIZED_CALLABLE_REFERENCES import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_UNIFIED_NULL_CHECKS import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.PARAMETERS_METADATA -import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.RELEASE +import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.JDK_RELEASE import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.model.DependencyDescription @@ -146,7 +146,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig register(PARAMETERS_METADATA, JVMConfigurationKeys.PARAMETERS_METADATA) register(JVM_TARGET, JVMConfigurationKeys.JVM_TARGET) register(SERIALIZE_IR, JVMConfigurationKeys.SERIALIZE_IR) - register(RELEASE, JVMConfigurationKeys.RELEASE) + register(JDK_RELEASE, JVMConfigurationKeys.JDK_RELEASE) } @OptIn(ExperimentalPathApi::class, ExperimentalStdlibApi::class)