[KT-84822] Replace minimal stdlib srcs for real src and remove -Xcompile-builtins-as-part-of-stdlib by zardilior · Pull Request #5894 · JetBrains/kotlin

zardilior · 2026-04-18T19:20:59Z

This PR unifies the Jklib and JVM minimal stdlib by replacing local stubs with production source files from the core stdlib and jvm-minimal-for-test.

Minimizes redundant, local stubs in favor of real production code or code from jvm-minimal-for-test

Summary of Deletions & Replacements

Component	Action	Source Replacement
Char.kt	Deleted stubs	Synced core `expect`/`actual` from `stdlib`.
Serializable.kt	Deleted stub	Synced `expect` from `jvm-minimal` and `actual` from `stdlib`.
Collections	Deleted `minimalCollections.kt`	Replaced with production `Collections.kt` interfaces.
EnumEntries.kt	Deleted stub	Removed redundant local file.
JVM Internals	Deleted `JavaStubs`/`TypeIntrinsics`	Delegated directly to core source files.

Additional Changes:

Removed/Cleaned -Xcompile-builtins-as-part-of-stdlib from K2JklibCompiler which is no longer used as its been integrated with -xStdlib-compilation see https://youtrack.jetbrains.com/issue/KT-80839

kotlin-safe-merge · 2026-04-18T19:21:05Z

Code Owners

Rule	Owners	Approval
`/compiler/cli/cli-base/gen/org/jetbrains/kotlin/cli/common/arguments/K2JKlibCompilerArgumentsCopyGenerated.kt`, `/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/arguments/K2JKlibCompilerArguments.kt`	`@gkdn`, `@jDramaix`, `@kevinoconnor7`, `@zardilior`	✅ `@jDramaix`
`/compiler/testData/ir/irText/`	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` `@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`	✅ `@demiurg906` 🔒
`**.gradle.kts`	`@sellmair` kotlin-build-infrastructure `@goodwinnk` `@Badya` `@4u7` `@tbogdanova` `@CristianGM` `@SmialyKot` `@ozzush` `@kbrgnj`	✅ `@CristianGM`
`/libraries/stdlib/jklib-for-test/`	`@DmitryNekrasov`, `@fzhinkin`, `@gkdn`, `@ilya-g`, `@jDramaix`, `@kevinoconnor7`, `@qwwdfsad`, `@zardilior`	✅ `@jDramaix`

zardilior · 2026-04-18T19:22:12Z

    substrateStdlibCompilerDependencies(commonDependency("org.codehaus.woodstox:stax2-api"))
    substrateStdlibCompilerDependencies(commonDependency("com.fasterxml:aalto-xml"))
+
+    // 2. Dependencies to COMPILE the minimal stdlib KLIB


Moved from the second block of dependencies

zardilior · 2026-04-18T19:22:27Z

    isCanBeResolved = true
 }

+val klibCompileClasspath by configurations.creating {


Moved from below as dependencies will now stay in a single block

zardilior · 2026-04-28T23:39:43Z

-
-        val jvmSourceFiles = jvmFiles.map { it.absolutePath }
-        val commonSourceFiles = commonFiles.map { it.absolutePath }
+        val (commonSourceFiles, jvmSourceFiles) = allFiles


Style improvement

zardilior · 2026-04-28T23:40:56Z

            "-opt-in=kotlin.contracts.ExperimentalContracts",
            "-opt-in=kotlin.ExperimentalMultiplatform",
            "-opt-in=kotlin.contracts.ExperimentalExtendedContracts",
-            "-Xcompile-builtins-as-part-of-stdlib",


This flag is no longer used see
https://youtrack.jetbrains.com/issue/KT-80839

zardilior · 2026-04-28T23:55:22Z

-            .map { it.absolutePath }
-            .joinToString(File.pathSeparator)
-
+        val fullClasspath = klibCompileClasspath.asPath


Simplified with equivalent logic

…lib-for-test

….kts and compiler arguments

demiurg906

/final

zardilior · 2026-04-30T23:05:27Z

/safe-merge

KotlinBuild · 2026-04-30T23:06:42Z

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

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5894/safe-merge
Commit: dac33b5

KotlinBuild · 2026-05-01T00:35:52Z

Triggered a retry attempt №1 out of 1.

KotlinBuild · 2026-05-01T01:35:04Z

Quality gate finished successfully (recovered via retry).

zardilior commented Apr 18, 2026

View reviewed changes

zardilior changed the title ~~[JKLIB][TEST] Unmute IR text tests by using real stdlib sources in jkib-for-test~~ [KT-84822] Unmute IR text tests by using real stdlib sources in jkib-for-test Apr 18, 2026

zardilior force-pushed the zardilior/fixing-jklib-stdlib-for-tests branch 3 times, most recently from f194d1a to 7124432 Compare April 28, 2026 23:36

zardilior commented Apr 28, 2026

View reviewed changes

zardilior force-pushed the zardilior/fixing-jklib-stdlib-for-tests branch 2 times, most recently from d0f108a to 02a5975 Compare April 28, 2026 23:53

zardilior changed the title ~~[KT-84822] Unmute IR text tests by using real stdlib sources in jkib-for-test~~ [KT-84822] Replace minimal stdlib srcs for real src and remove -Xcompile-builtins-as-part-of-stdlib Apr 28, 2026

zardilior commented Apr 28, 2026

View reviewed changes

zardilior force-pushed the zardilior/fixing-jklib-stdlib-for-tests branch 2 times, most recently from 2768c3f to 72fd807 Compare April 29, 2026 02:08

zardilior marked this pull request as ready for review April 29, 2026 02:11

zardilior requested review from demiurg906 and jDramaix and removed request for demiurg906 and jDramaix April 29, 2026 02:11

zardilior marked this pull request as draft April 29, 2026 02:12

zardilior force-pushed the zardilior/fixing-jklib-stdlib-for-tests branch from 72fd807 to 19a9a0b Compare April 29, 2026 02:16

zardilior requested review from demiurg906 and jDramaix April 29, 2026 02:23

zardilior marked this pull request as ready for review April 29, 2026 02:23

zardilior requested a review from sellmair April 29, 2026 03:40

zardilior force-pushed the zardilior/fixing-jklib-stdlib-for-tests branch 4 times, most recently from 87d64ea to d372e83 Compare April 29, 2026 05:59

zardilior added 2 commits April 29, 2026 00:01

[JKLIB][TEST] Unmute IR text tests by using real stdlib sources in jk…

525f1a6

…lib-for-test

[JKLIB] Remove -Xcompile-builtins-as-part-of-stdlib from build.gradle…

34a9509

….kts and compiler arguments

zardilior force-pushed the zardilior/fixing-jklib-stdlib-for-tests branch from d372e83 to 34a9509 Compare April 29, 2026 06:02

demiurg906 requested review from CristianGM and removed request for sellmair April 29, 2026 08:29

demiurg906 approved these changes Apr 29, 2026

View reviewed changes

CristianGM approved these changes Apr 30, 2026

View reviewed changes

jDramaix approved these changes Apr 30, 2026

View reviewed changes

KotlinBuild merged commit 5f95569 into master May 1, 2026
1 check passed

KotlinBuild deleted the zardilior/fixing-jklib-stdlib-for-tests branch May 1, 2026 01:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[KT-84822] Replace minimal stdlib srcs for real src and remove -Xcompile-builtins-as-part-of-stdlib #5894

[KT-84822] Replace minimal stdlib srcs for real src and remove -Xcompile-builtins-as-part-of-stdlib #5894
KotlinBuild merged 2 commits intomasterfrom
zardilior/fixing-jklib-stdlib-for-tests

zardilior commented Apr 18, 2026 •

edited

Loading

Uh oh!

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

edited

Loading

Uh oh!

zardilior Apr 18, 2026

Uh oh!

zardilior Apr 18, 2026

Uh oh!

zardilior Apr 28, 2026

Uh oh!

zardilior Apr 28, 2026

Uh oh!

zardilior Apr 28, 2026 •

edited

Loading

Uh oh!

demiurg906 left a comment

Uh oh!

zardilior commented Apr 30, 2026

Uh oh!

KotlinBuild commented Apr 30, 2026

Uh oh!

KotlinBuild commented May 1, 2026

Uh oh!

KotlinBuild commented May 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

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

Uh oh!

Summary of Deletions & Replacements

Uh oh!

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

Uh oh!

Code Owners

Uh oh!

zardilior Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

zardilior Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

zardilior Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

zardilior Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

zardilior Apr 28, 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!

demiurg906 left a comment

Choose a reason for hiding this comment

Uh oh!

zardilior commented Apr 30, 2026

Uh oh!

KotlinBuild commented Apr 30, 2026

Uh oh!

KotlinBuild commented May 1, 2026

Uh oh!

KotlinBuild commented May 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

zardilior commented Apr 18, 2026 •

edited

Loading

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

edited

Loading

zardilior Apr 28, 2026 •

edited

Loading