[BTA] Use typed copy in deepCopy() instead of string round-trip by ywett02 · Pull Request #5855 · JetBrains/kotlin

ywett02 · 2026-04-13T12:00:35Z

Replace applyArgumentStrings(toArgumentStrings()) with applyCompilerArguments(toCompilerArguments()) in JvmCompilerArgumentsImpl.deepCopy().

kodee-bot · 2026-04-13T12:00:42Z

Hi! It looks like there are no references to any YT issues in the commit messages.
If the change is non-functional, feel free to resolve the comment :)
Otherwise, please add them as requested in the guideline.

kotlin-safe-merge · 2026-04-13T12:00:42Z

Code Owners

Rule	Owners	Approval
`/compiler/build-tools/`	build-tools-api `@wojtek-kalicinski` `@ALikhachev` `@Herudaio` `@ywett02` `@shinkai-tester`	✅ `@ALikhachev`
`/compiler/build-tools/kotlin-build-tools-compat/gen/`, `/compiler/build-tools/kotlin-build-tools-impl/gen/`	kotlin `@klikh` `@antonarhipov` `@amakeev` `@singleton11` `@AYastrebov` `@wojtek-kalicinski` `@ALikhachev` `@shengyou` `@svtk` `@Tapchicoma` `@joffrey-bion` `@shishkin-pavel` `@SebastianAigner` `@qwwdfsad` `@antohaby` `@eupp` `@ilya-g` `@murfel` `@shanshin` `@abarsov` `@pahill` `@Herudaio` `@atyrin` `@DmitryNekrasov` `@vmishenev` `@sandwwraith` `@zsmb13` `@nomisRev` `@utikeev` `@fzhinkin` `@AbdullinAM` `@ywett02` `@strangepleasures` `@Jeffset` `@CherepanovAleksei` `@solarday` `@sellmair` `@whyoleg` `@dkhalanskyjb` `@shinkai-tester` `@viakunin` `@Daria-Voronina` `@adam-enko` kotlin-compiler `@erokhins` kotlin-frontend `@ligee` `@dzharkov` `@bnorm` `@mglukhikh` `@KvanTTT` `@cypressious` `@demiurg906` `@FenstonSingel` `@lunakoly` `@agamzikova` `@GrigoriiSolnyshkin` `@Aleksandra-Arsenteva` kotlin-wasm `@bashor` `@karlosz` `@ilgonmic` `@jmrtsh` `@igoriakovlev` `@agamzikova` `@alex28sh` `@ozzush` kotlin-jvm `@udalov` `@ilmirus` `@grechkovlad` `@MaxVerevkin` `@zhelenskiy` `@aShalygin` `@andrey-mogilev` kotlin-js `@JSMonk` `@broadwaylamb` `@seclerp` `@AnzhelaSukhanova` kotlin-common-backend `@vsukharev` `@kunyavskiy` `@ivandev0` `@AnzhelaSukhanova` `@mcpiroman` `@ddolovov` `@mpiekutowski` kotlin-native `@mMaxy` `@projedi` `@anton-bannykh` `@sbogolepov` `@DmT021` `@haitaka` `@glukianets` `@azakharenko` `@homuroll` `@SvyatoslavScherbina` kotlin-language-evolution `@serras` `@jesyspa` `@ice-phoenix` `@zarechenskiy` `@nikitabobko` `@FenstonSingel` `@InversionSpaces` `@e2e4b6b7` `@YuliaKorolenko`	✅ `@ALikhachev`

ywett02 · 2026-04-13T12:00:46Z

/dry-run

KotlinBuild · 2026-04-13T12:03:54Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/924729568 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: 4389b55

KotlinBuild · 2026-04-13T13:34:01Z

Triggered a retry attempt №1 out of 1.

ywett02 · 2026-04-13T13:59:07Z

/dry-run

KotlinBuild · 2026-04-13T14:00:11Z

Quality gate failed. See https://buildserver.labs.intellij.net/build/924729568 to get full insight.

KotlinBuild · 2026-04-13T14:01:19Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/924852109 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: 70b31ab

KotlinBuild · 2026-04-13T15:57:27Z

Quality gate finished successfully.

ywett02 · 2026-04-14T12:08:47Z

/dry-run

KotlinBuild · 2026-04-14T12:10:16Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/925590812 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: 693d55b

KotlinBuild · 2026-04-14T14:33:30Z

Triggered a retry attempt №1 out of 1.

ywett02 · 2026-04-14T14:57:51Z

/dry-run

KotlinBuild · 2026-04-14T14:58:41Z

Quality gate failed. See https://buildserver.labs.intellij.net/build/925590812 to get full insight.

KotlinBuild · 2026-04-14T15:00:05Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/925801681 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: f85b39b

KotlinBuild · 2026-04-14T18:20:17Z

Triggered a retry attempt №1 out of 1.

KotlinBuild · 2026-04-14T19:20:00Z

Quality gate failed. See https://buildserver.labs.intellij.net/build/925801681 to get full insight.

ALikhachev

Other than the minor comment, LGTM

New changes affect files owned by this reviewer. Re-review required.

ywett02 · 2026-04-16T12:12:39Z

/dry-run

KotlinBuild · 2026-04-16T12:14:18Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/927796511 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: 20a431c

KotlinBuild · 2026-04-16T14:28:09Z

Quality gate finished successfully.

ywett02 · 2026-04-17T10:51:32Z

/dry-run

KotlinBuild · 2026-04-17T10:53:18Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/928672496 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: 66c7cff

KotlinBuild · 2026-04-17T12:31:55Z

Quality gate finished successfully.

ywett02 · 2026-04-21T13:54:37Z

/dry-run

KotlinBuild · 2026-04-21T13:56:00Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/931568938 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: 25f053c

KotlinBuild · 2026-04-21T15:09:10Z

Triggered a retry attempt №1 out of 1.

ALikhachev · 2026-04-21T15:14:59Z

+            return JvmCompilationOperationWrapper(
+                base.build().also { it.compilerArguments.applyCompilerArguments(base.compilerArguments.toCompilerArguments()) })
+        }


Could you clarify what this is needed for?

What wasn't covered by the previous implementation calling deepCopy?

Also, I see this change for Pre2_3_20 and Pre_2_4_20, but not Pre_2_4_0:

kotlin/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/internal/wrappers/KotlinWrapperPre2_4_0.kt

Line 137 in ae6c575

return JvmCompilationOperationWrapper(base.build())

. Is that okay?

Could you clarify what this is needed for? & What wasn't covered by the previous implementation calling deepCopy?

This change is for backward compatibility with the current change.

Let's have -xfriend-paths=home/directory/pathwith,comma as an example.

Without a backward compatibility wrapper, you get different results based on the IMPL version after calling build on the JVM operation:

2.4.20(api)&2.4.20(impl)=>"User/home/directory/pathwith,comma"
2.4.20(api)&<2.4.20(impl)=>""User/home/directory/pathwith", "User/comma""

The implementation in the 2_4_20 wrapper ensures this behavior is correct across versions, as demonstrated by passing tests in: #5879.

In theory, if we are okay with the behavior being different across IMPL versions, it can be removed. However, such implementation would require forking tests since they would start failing.

Also, I see this change for Pre2_3_20 and Pre_2_4_20, but not Pre_2_4_0. Is that okay?

2_4_20 traverses the tree of wrappers and tries to invoke certain functions at the closest parent. To make it work, it was necessary so that every wrapped object is called base. 2_4_0 already uses base. 2_3_20 was using baseCompilerArguments.

KotlinBuild · 2026-04-21T15:28:42Z

Quality gate failed. See https://buildserver.labs.intellij.net/build/931568938 to get full insight.

ywett02 · 2026-04-22T07:37:06Z

/dry-run

KotlinBuild · 2026-04-22T07:38:25Z

THIS IS A DRY RUN

Quality gate is triggered at https://buildserver.labs.intellij.net/build/932117259 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: e27d2d6

KotlinBuild · 2026-04-22T08:47:34Z

Triggered a retry attempt №1 out of 1.

KotlinBuild · 2026-04-22T09:02:14Z

Quality gate failed. See https://buildserver.labs.intellij.net/build/932117259 to get full insight.

ywett02 · 2026-04-22T09:19:30Z

@ALikhachev, the last two commits are from #5878 (review).

Replace `applyArgumentStrings(toArgumentStrings())` with `applyCompilerArguments(toCompilerArguments())` in JvmCompilerArgumentsImpl.deepCopy(). ^KT-85696 Verification Pending

^KT-85696 Verification Pending

^KT-85787 Fixed

ywett02 · 2026-04-22T17:28:35Z

/safe-merge

KotlinBuild · 2026-04-22T17:29:51Z

Quality gate is triggered at https://buildserver.labs.intellij.net/build/932675858 — use this link to get full insight.

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5855/safe-merge
Commit: ba7c4d6

KotlinBuild · 2026-04-22T19:00:27Z

Quality gate finished successfully.

ywett02 force-pushed the rr/ikvl/no_string branch from 0949390 to 2f7689e Compare April 14, 2026 11:27

ALikhachev reviewed Apr 15, 2026

View reviewed changes

Comment thread ...ild-tools-generator/src/org/jetbrains/kotlin/buildtools/generator/BtaImplOptionsGenerator.kt Outdated

ALikhachev previously approved these changes Apr 15, 2026

View reviewed changes

ywett02 force-pushed the rr/ikvl/no_string branch from 2a8f4e6 to 20a431c Compare April 16, 2026 12:11

kotlin-safe-merge Bot requested a review from ALikhachev April 16, 2026 12:11

ywett02 changed the base branch from master to rr/ikvl/KT-85414_delimiter_compatibility April 16, 2026 12:11

ywett02 requested a review from wojtek-kalicinski April 16, 2026 12:12

ywett02 force-pushed the rr/ikvl/KT-85414_delimiter_compatibility branch from 12c712e to f48f7eb Compare April 16, 2026 13:06

Base automatically changed from rr/ikvl/KT-85414_delimiter_compatibility to master April 16, 2026 17:08

ywett02 force-pushed the rr/ikvl/no_string branch from 20a431c to a15a274 Compare April 17, 2026 10:49

ywett02 force-pushed the rr/ikvl/no_string branch from a15a274 to 6232776 Compare April 21, 2026 13:53

ALikhachev reviewed Apr 21, 2026

View reviewed changes

ALikhachev requested changes Apr 21, 2026

View reviewed changes

ywett02 force-pushed the rr/ikvl/no_string branch from 6232776 to 694b892 Compare April 22, 2026 07:36

ywett02 force-pushed the rr/ikvl/no_string branch from 694b892 to 427c5dd Compare April 22, 2026 07:47

ywett02 added 5 commits April 22, 2026 11:21

[BTA] Use typed copy in deepCopy() instead of string round-trip

522caea

Replace `applyArgumentStrings(toArgumentStrings())` with `applyCompilerArguments(toCompilerArguments())` in JvmCompilerArgumentsImpl.deepCopy(). ^KT-85696 Verification Pending

[BTA] Fix remaining string round-trip in V1 adapter deepCopy; update doc

8a070a7

^KT-85696 Verification Pending

[BTA] Add backward compatibility for typed-based copy

abedbc0

^KT-85696 Verification Pending

[BTA] Add raw argument values support for backward compatibility tests

dbcfdea

^KT-85787 Fixed

[BTA] Add raw argument values support for forward compatibility tests

0f2b4eb

^KT-85787 Fixed

ywett02 force-pushed the rr/ikvl/no_string branch from 6e4e6cd to 0f2b4eb Compare April 22, 2026 09:21

ALikhachev approved these changes Apr 22, 2026

View reviewed changes

KotlinBuild merged commit f5183ae into master Apr 22, 2026
1 check passed

KotlinBuild deleted the rr/ikvl/no_string branch April 22, 2026 19:00

Conversation

ywett02 commented Apr 13, 2026

Uh oh!

kodee-bot Bot commented Apr 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kotlin-safe-merge Bot commented Apr 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Owners

Uh oh!

ywett02 commented Apr 13, 2026

Uh oh!

KotlinBuild commented Apr 13, 2026

Uh oh!

KotlinBuild commented Apr 13, 2026

Uh oh!

ywett02 commented Apr 13, 2026

Uh oh!

KotlinBuild commented Apr 13, 2026

Uh oh!

KotlinBuild commented Apr 13, 2026

Uh oh!

KotlinBuild commented Apr 13, 2026

Uh oh!

ywett02 commented Apr 14, 2026

Uh oh!

KotlinBuild commented Apr 14, 2026

Uh oh!

KotlinBuild commented Apr 14, 2026

Uh oh!

ywett02 commented Apr 14, 2026

Uh oh!

KotlinBuild commented Apr 14, 2026

Uh oh!

KotlinBuild commented Apr 14, 2026

Uh oh!

KotlinBuild commented Apr 14, 2026

Uh oh!

KotlinBuild commented Apr 14, 2026

Uh oh!

Uh oh!

ALikhachev left a comment

Choose a reason for hiding this comment

Uh oh!

ywett02 commented Apr 16, 2026

Uh oh!

KotlinBuild commented Apr 16, 2026

Uh oh!

KotlinBuild commented Apr 16, 2026

Uh oh!

ywett02 commented Apr 17, 2026

Uh oh!

KotlinBuild commented Apr 17, 2026

Uh oh!

KotlinBuild commented Apr 17, 2026

Uh oh!

ywett02 commented Apr 21, 2026

Uh oh!

KotlinBuild commented Apr 21, 2026

Uh oh!

KotlinBuild commented Apr 21, 2026

Uh oh!

ALikhachev Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

ALikhachev Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

ALikhachev Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

ywett02 Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ywett02 Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

KotlinBuild commented Apr 21, 2026

Uh oh!

kodee-bot Bot commented Apr 13, 2026 •

edited

Loading

kotlin-safe-merge Bot commented Apr 13, 2026 •

edited

Loading

ywett02 Apr 22, 2026 •

edited

Loading