Skip to content

Commit bdfbb2b

Browse files
dkrasnoffdkrasnoff
committed
KTL-724 Removed unnecessary js and wasm arguments from the whitelist
1 parent 62e5a04 commit bdfbb2b

File tree

4 files changed

+27
-36
lines changed

4 files changed

+27
-36
lines changed

‎src/main/kotlin/com/compiler/server/utils/CompilerArgumentsUtil.kt‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,12 @@ class CompilerArgumentsUtil(
165165

166166
private val ALLOWED_JS_ARGUMENTS = setOf(
167167
// file paths and environment settings
168-
"module-name",
169168
"Xir-keep",
170-
"module-kind",
171169
"main",
172170
"Xir-dce",
173171
"Xir-dce-runtime-diagnostic",
174-
"Xir-dce-print-reachability-info",
175172
"Xir-property-lazy-initialization",
176173
"Xir-minimized-member-names",
177-
"Xir-module-name",
178174
"Xir-generate-inline-anonymous-functions",
179175
"Xgenerate-polyfills",
180176
"Xes-classes",
@@ -190,8 +186,6 @@ class CompilerArgumentsUtil(
190186

191187
private val ALLOWED_WASM_ARGUMENTS = setOf(
192188
// file paths and environment settings
193-
"Xwasm",
194-
"Xwasm-target",
195189
"Xwasm-debug-info",
196190
"Xwasm-debug-friendly",
197191
"Xwasm-kclass-fqn",
@@ -200,10 +194,7 @@ class CompilerArgumentsUtil(
200194
"Xwasm-use-traps-instead-of-exceptions",
201195
"Xwasm-use-new-exception-proposal",
202196
"Xwasm-no-jstag",
203-
"Xwasm-debugger-custom-formatters",
204-
"Xwasm-source-map-include-mappings-from-unavailable-sources",
205-
"Xwasm-ic-cache-readonly",
206-
"Xwasm-generate-dwarf"
197+
"Xwasm-source-map-include-mappings-from-unavailable-sources"
207198
)
208199

209200
// Use Pair if you want to provide different values for user and for actual use.
@@ -277,7 +268,7 @@ class CompilerArgumentsUtil(
277268
"ir-output-name" to WASM_DEFAULT_MODULE_NAME,
278269
"XPlugin" to Pair(
279270
kotlinEnvironment.COMPOSE_WASM_COMPILER_PLUGINS.map { it.split("/").last() },
280-
kotlinEnvironment.COMPOSE_WASM_COMPILER_PLUGINS
271+
kotlinEnvironment.COMPOSE_WASM_COMPILER_PLUGINS
281272
),
282273
"P" to Pair(
283274
kotlinEnvironment.composeWasmCompilerPluginOptions,
@@ -383,7 +374,7 @@ class CompilerArgumentsUtil(
383374
return (kotlinCompilerArguments.topLevel.arguments +
384375
commonArgumentsLevel.arguments +
385376
commonKlibBasedArgumentsLevel.arguments +
386-
wasmLevel.arguments+
377+
wasmLevel.arguments +
387378
jsLevel.arguments)
388379
.processCompilerArgs(
389380
predefinedArguments = PREDEFINED_WASM_FIRST_PHASE_ARGUMENTS,

‎src/test/resources/compiler-arguments/compose-wasm-expected-compiler-args.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@
12831283
"isNullable": false,
12841284
"defaultValue": false
12851285
},
1286-
"disabled": false,
1286+
"disabled": true,
12871287
"predefinedValues": null
12881288
},
12891289
{
@@ -1295,7 +1295,7 @@
12951295
"isNullable": true,
12961296
"defaultValue": null
12971297
},
1298-
"disabled": false,
1298+
"disabled": true,
12991299
"predefinedValues": null
13001300
},
13011301
{
@@ -1415,7 +1415,7 @@
14151415
"isNullable": false,
14161416
"defaultValue": false
14171417
},
1418-
"disabled": false,
1418+
"disabled": true,
14191419
"predefinedValues": null
14201420
},
14211421
{
@@ -1451,7 +1451,7 @@
14511451
"isNullable": false,
14521452
"defaultValue": false
14531453
},
1454-
"disabled": false,
1454+
"disabled": true,
14551455
"predefinedValues": null
14561456
},
14571457
{
@@ -1463,7 +1463,7 @@
14631463
"isNullable": false,
14641464
"defaultValue": false
14651465
},
1466-
"disabled": false,
1466+
"disabled": true,
14671467
"predefinedValues": null
14681468
},
14691469
{
@@ -1619,7 +1619,7 @@
16191619
"isNullable": true,
16201620
"defaultValue": null
16211621
},
1622-
"disabled": false,
1622+
"disabled": true,
16231623
"predefinedValues": null
16241624
},
16251625
{
@@ -1703,7 +1703,7 @@
17031703
"isNullable": false,
17041704
"defaultValue": false
17051705
},
1706-
"disabled": false,
1706+
"disabled": true,
17071707
"predefinedValues": null
17081708
},
17091709
{
@@ -1739,7 +1739,7 @@
17391739
"isNullable": true,
17401740
"defaultValue": null
17411741
},
1742-
"disabled": false,
1742+
"disabled": true,
17431743
"predefinedValues": null
17441744
},
17451745
{

‎src/test/resources/compiler-arguments/js-expected-compiler-args.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@
12811281
"isNullable": false,
12821282
"defaultValue": false
12831283
},
1284-
"disabled": false,
1284+
"disabled": true,
12851285
"predefinedValues": null
12861286
},
12871287
{
@@ -1293,7 +1293,7 @@
12931293
"isNullable": true,
12941294
"defaultValue": null
12951295
},
1296-
"disabled": false,
1296+
"disabled": true,
12971297
"predefinedValues": null
12981298
},
12991299
{
@@ -1413,7 +1413,7 @@
14131413
"isNullable": false,
14141414
"defaultValue": false
14151415
},
1416-
"disabled": false,
1416+
"disabled": true,
14171417
"predefinedValues": null
14181418
},
14191419
{
@@ -1449,7 +1449,7 @@
14491449
"isNullable": false,
14501450
"defaultValue": false
14511451
},
1452-
"disabled": false,
1452+
"disabled": true,
14531453
"predefinedValues": null
14541454
},
14551455
{
@@ -1461,7 +1461,7 @@
14611461
"isNullable": false,
14621462
"defaultValue": false
14631463
},
1464-
"disabled": false,
1464+
"disabled": true,
14651465
"predefinedValues": null
14661466
},
14671467
{
@@ -1617,7 +1617,7 @@
16171617
"isNullable": true,
16181618
"defaultValue": null
16191619
},
1620-
"disabled": false,
1620+
"disabled": true,
16211621
"predefinedValues": null
16221622
},
16231623
{
@@ -1701,7 +1701,7 @@
17011701
"isNullable": false,
17021702
"defaultValue": false
17031703
},
1704-
"disabled": false,
1704+
"disabled": true,
17051705
"predefinedValues": null
17061706
},
17071707
{
@@ -1737,7 +1737,7 @@
17371737
"isNullable": true,
17381738
"defaultValue": null
17391739
},
1740-
"disabled": false,
1740+
"disabled": true,
17411741
"predefinedValues": null
17421742
},
17431743
{

‎src/test/resources/compiler-arguments/wasm-expected-compiler-args.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@
12811281
"isNullable": false,
12821282
"defaultValue": false
12831283
},
1284-
"disabled": false,
1284+
"disabled": true,
12851285
"predefinedValues": null
12861286
},
12871287
{
@@ -1293,7 +1293,7 @@
12931293
"isNullable": true,
12941294
"defaultValue": null
12951295
},
1296-
"disabled": false,
1296+
"disabled": true,
12971297
"predefinedValues": null
12981298
},
12991299
{
@@ -1413,7 +1413,7 @@
14131413
"isNullable": false,
14141414
"defaultValue": false
14151415
},
1416-
"disabled": false,
1416+
"disabled": true,
14171417
"predefinedValues": null
14181418
},
14191419
{
@@ -1449,7 +1449,7 @@
14491449
"isNullable": false,
14501450
"defaultValue": false
14511451
},
1452-
"disabled": false,
1452+
"disabled": true,
14531453
"predefinedValues": null
14541454
},
14551455
{
@@ -1461,7 +1461,7 @@
14611461
"isNullable": false,
14621462
"defaultValue": false
14631463
},
1464-
"disabled": false,
1464+
"disabled": true,
14651465
"predefinedValues": null
14661466
},
14671467
{
@@ -1617,7 +1617,7 @@
16171617
"isNullable": true,
16181618
"defaultValue": null
16191619
},
1620-
"disabled": false,
1620+
"disabled": true,
16211621
"predefinedValues": null
16221622
},
16231623
{
@@ -1701,7 +1701,7 @@
17011701
"isNullable": false,
17021702
"defaultValue": false
17031703
},
1704-
"disabled": false,
1704+
"disabled": true,
17051705
"predefinedValues": null
17061706
},
17071707
{
@@ -1737,7 +1737,7 @@
17371737
"isNullable": true,
17381738
"defaultValue": null
17391739
},
1740-
"disabled": false,
1740+
"disabled": true,
17411741
"predefinedValues": null
17421742
},
17431743
{

0 commit comments

Comments
 (0)