Skip to content

Commit 98e9036

Browse files
broadwaylambSpace Team
authored andcommitted
[CLI] Drop the -Xtyped-arrays flag from K/JS CLI
^KT-70222 Fixed
1 parent f2f9688 commit 98e9036

File tree

8 files changed

+2
-39
lines changed

8 files changed

+2
-39
lines changed

compiler/arguments/resources/kotlin-compiler-arguments.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8098,7 +8098,7 @@
80988098
"introducedVersion": "1.1.3",
80998099
"stabilizedVersion": null,
81008100
"deprecatedVersion": "2.1.0",
8101-
"removedVersion": null
8101+
"removedVersion": "2.3.0"
81028102
}
81038103
},
81048104
{

compiler/arguments/src/org/jetbrains/kotlin/arguments/description/JsCompilerArguments.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,6 @@ val actualJsArguments by compilerArgumentsLevel(CompilerArgumentsLevelNames.jsAr
539539
It is deprecated and will be removed in a future release.""".asReleaseDependent()
540540
valueType = BooleanType.defaultFalse
541541

542-
additionalAnnotations(
543-
Deprecated("It is senseless to use with IR compiler. Only for compatibility."),
544-
)
545542
additionalMetadata(
546543
GradleOption(
547544
value = DefaultValue.BOOLEAN_FALSE_DEFAULT,
@@ -558,6 +555,7 @@ It is deprecated and will be removed in a future release.""".asReleaseDependent(
558555
lifecycle(
559556
introducedVersion = KotlinReleaseVersion.v1_1_3,
560557
deprecatedVersion = KotlinReleaseVersion.v2_1_0,
558+
removedVersion = KotlinReleaseVersion.v2_3_0,
561559
)
562560
}
563561

compiler/build-tools/kotlin-build-tools-api/gen/org/jetbrains/kotlin/buildtools/api/arguments/JsArguments.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -356,16 +356,6 @@ public interface JsArguments : WasmArguments {
356356
@ExperimentalCompilerArgument
357357
public val X_ES_LONG_AS_BIGINT: JsArgument<Boolean?> = JsArgument("X_ES_LONG_AS_BIGINT")
358358

359-
/**
360-
* This option does nothing and is left for compatibility with the legacy backend.
361-
* It is deprecated and will be removed in a future release.
362-
*
363-
* WARNING: this option is EXPERIMENTAL and it may be changed in the future without notice or may be removed entirely.
364-
*/
365-
@JvmField
366-
@ExperimentalCompilerArgument
367-
public val X_TYPED_ARRAYS: JsArgument<Boolean> = JsArgument("X_TYPED_ARRAYS")
368-
369359
/**
370360
* Disable internal declaration export.
371361
*

compiler/build-tools/kotlin-build-tools-impl/gen/org/jetbrains/kotlin/buildtools/internal/arguments/JsArgumentsImpl.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_IR_
5656
import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_OPTIMIZE_GENERATED_JS
5757
import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_PLATFORM_ARGUMENTS_IN_MAIN_FUNCTION
5858
import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_STRICT_IMPLICIT_EXPORT_TYPES
59-
import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_TYPED_ARRAYS
6059
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
6160

6261
public class JsArgumentsImpl : WasmArgumentsImpl(), JsArguments {
@@ -110,7 +109,6 @@ public class JsArgumentsImpl : WasmArgumentsImpl(), JsArguments {
110109
if ("X_ES_GENERATORS" in optionsMap) { arguments.useEsGenerators = get(X_ES_GENERATORS) }
111110
if ("X_ES_ARROW_FUNCTIONS" in optionsMap) { arguments.useEsArrowFunctions = get(X_ES_ARROW_FUNCTIONS) }
112111
if ("X_ES_LONG_AS_BIGINT" in optionsMap) { arguments.compileLongAsBigInt = get(X_ES_LONG_AS_BIGINT) }
113-
if ("X_TYPED_ARRAYS" in optionsMap) { arguments.typedArrays = get(X_TYPED_ARRAYS) }
114112
if ("X_FRIEND_MODULES_DISABLED" in optionsMap) { arguments.friendModulesDisabled = get(X_FRIEND_MODULES_DISABLED) }
115113
if ("X_FRIEND_MODULES" in optionsMap) { arguments.friendModules = get(X_FRIEND_MODULES) }
116114
if ("X_ENABLE_EXTENSION_FUNCTIONS_IN_EXTERNALS" in optionsMap) { arguments.extensionFunctionsInExternals = get(X_ENABLE_EXTENSION_FUNCTIONS_IN_EXTERNALS) }

compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -418,18 +418,6 @@ class K2JSCompilerArguments : K2WasmCompilerArguments() {
418418
field = value
419419
}
420420

421-
@Deprecated("It is senseless to use with IR compiler. Only for compatibility.")
422-
@Argument(
423-
value = "-Xtyped-arrays",
424-
description = """This option does nothing and is left for compatibility with the legacy backend.
425-
It is deprecated and will be removed in a future release.""",
426-
)
427-
var typedArrays: Boolean = false
428-
set(value) {
429-
checkFrozen()
430-
field = value
431-
}
432-
433421
@Argument(
434422
value = "-Xfriend-modules-disabled",
435423
description = "Disable internal declaration export.",

compiler/cli/cli-common/gen/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArgumentsCopyGenerated.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ fun copyK2JSCompilerArguments(from: K2JSCompilerArguments, to: K2JSCompilerArgum
5252
to.sourceMapPrefix = from.sourceMapPrefix
5353
to.strictImplicitExportType = from.strictImplicitExportType
5454
to.target = from.target
55-
@Suppress("DEPRECATION")
56-
to.typedArrays = from.typedArrays
5755
to.useEsArrowFunctions = from.useEsArrowFunctions
5856
to.useEsClasses = from.useEsClasses
5957
to.useEsGenerators = from.useEsGenerators

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/pipeline/web/WebConfigurationPhase.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,6 @@ object CommonWebConfigurationUpdater : ConfigurationUpdater<K2JSCompilerArgument
118118
services: Services,
119119
) {
120120
val messageCollector = configuration.messageCollector
121-
@Suppress("DEPRECATION")
122-
if (arguments.typedArrays) {
123-
messageCollector.report(
124-
WARNING,
125-
"The '-Xtyped-arrays' command line option does nothing and will be removed in Kotlin 2.3"
126-
)
127-
}
128121

129122
if (arguments.generateDwarf) {
130123
configuration.put(WasmConfigurationKeys.WASM_GENERATE_DWARF, true)

compiler/testData/cli/js/jsExtraHelp.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ where advanced options include:
3333
-Xes-generators Enable ES2015 generator functions usage inside the compiled code. Enabled by default in case of ES2015 target usage
3434
-Xes-arrow-functions Use ES2015 arrow functions in the JavaScript code generated for Kotlin lambdas. Enabled by default in case of ES2015 target usage
3535
-Xes-long-as-bigint Compile Long values as ES2015 bigint instead of object. Enabled by default in case of ES2015 target usage
36-
-Xtyped-arrays This option does nothing and is left for compatibility with the legacy backend.
37-
It is deprecated and will be removed in a future release.
3836
-Xfriend-modules-disabled Disable internal declaration export.
3937
-Xfriend-modules=<path> Paths to friend modules.
4038
-Xenable-extension-functions-in-externals

0 commit comments

Comments
 (0)