Demiurg906/k1 tests removal/test data cleanup by demiurg906 · Pull Request #5824 · JetBrains/kotlin

demiurg906 · 2026-04-07T10:29:32Z

No description provided.

kotlin-safe-merge · 2026-04-07T10:30:31Z

Code Owners

Rule	Owners	Approval
`/analysis/`	kotlin-analysis-api	✅ `@dimonchik0036`
`/compiler/fir/`, `/compiler/testData/codegen/script/`, `/compiler/testData/diagnostics/`, `/compiler/testData/ir/sourceRanges/`, `/compiler/testData/loadJava/`, `/compiler/tests-common-new/`, `/compiler/tests-spec/`, `/plugins/assign-plugin/`	kotlin-frontend	✅ `@dzharkov`
`/compiler/testData/codegen/asmLike/`, `/compiler/testData/codegen/boxModernJdk/`, `/libraries/tools/kotlinp/jvm/`	kotlin-jvm	✅ `@udalov`
`/compiler/testData/codegen/box/`, `/compiler/testData/codegen/boxJvm/`, `/compiler/testData/ir/irText/`	kotlin-compiler	✅ `@udalov`, `@ddolovov`, `@dzharkov`
`/compiler/testData/codegen/boxInline/`	kotlin-common-backend, kotlin-js, kotlin-jvm, kotlin-native, kotlin-wasm	✅ `@udalov`, `@ddolovov`
`/compiler/testData/codegen/bytecodeListing/`, `/compiler/testData/codegen/bytecodeText/`, `/compiler/testData/compileJavaAgainstKotlin/`	kotlin-frontend, kotlin-jvm	✅ `@udalov`, `@dzharkov`
`/compiler/testData/debug/`	kotlin-frontend, kotlin-js, kotlin-jvm, kotlin-native, kotlin-wasm	✅ `@dzharkov`, `@udalov`
`/compiler/testData/ir/interpreter/`, `/compiler/testData/klib/`	kotlin-common-backend	✅ `@ddolovov`
`/core/descriptors.runtime/`	kotlin-libraries, `@udalov`	✅ `@sandwwraith`, `@udalov`
`/native/native.tests/`	kotlin-common-backend, kotlin-native	✅ `@ddolovov`
`/plugins/atomicfu/`	kotlin-libraries	✅ `@sandwwraith`

demiurg906 · 2026-04-07T10:32:17Z

/dry-run

KotlinBuild · 2026-04-07T10:34:17Z

THIS IS A DRY RUN

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

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5824/safe-merge
Commit: 1d39ce3

KotlinBuild · 2026-04-07T11:47:56Z

Triggered a retry attempt #1 out of 1.

KotlinBuild · 2026-04-07T12:35:00Z

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

udalov · 2026-04-07T12:52:09Z

Many tests that were disabled on K1 also had comments explaining why they were disabled. Now that IGNORE_BACKEND_K1: ... is removed, the corresponding "reason" comments are not needed (and sometimes point to an innocent directive, as if trying to explain why it's there).

It's particularly not great where this is replaced with IGNORE_BACKEND: ANDROID, because this explanation will probably wildly confuse anyone in the future looking to increase Android test coverage. (Btw, I believe that most or all of these ignores are not needed: KT-85465.)

So, please remove/adjust headers that explain why tests on K1 were disabled in these tests:

./compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/continueInTryBlock.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/initializerBlock.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/inlineConstructor.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/inlineFunctionWithMultipleParameters.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/lambdaPassedToInlineFunction.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/loopWithinInlineFunction.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/simple.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/simpleDoWhile.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/stdlibFunctions.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/withReturnValue.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/withReturnValueDoWhileContinue.kt
./compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlinedBreakContinue/withReturnValueNested.kt
./compiler/testData/codegen/box/coroutines/suspendConversion/onNullableArgument.kt
./compiler/testData/codegen/box/evaluate/ubyteOperations.kt
./compiler/testData/codegen/box/evaluate/uintOperations.kt
./compiler/testData/codegen/box/evaluate/ulongOperations.kt
./compiler/testData/codegen/box/evaluate/ushortOperations.kt
./compiler/testData/codegen/box/funInterface/contravariantIntersectionType.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt43710.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt49160a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt49160b.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt49160c.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt49160d.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt49160e.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt50453.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt52757.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt52838b.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt53109.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt53422a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt53478.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt53553.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt53639.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt54400a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt54400b.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt54400c.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt57707.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt57834.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt59798.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt60291a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt60291b.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt60291c.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt60447a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt60447b.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt63733.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt63840a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt63840b.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt63840c.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt64066.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt64069.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt65300j.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt66229.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt66243.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt66272.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt66359a.kt
./compiler/testData/codegen/box/inference/pcla/issues/kt66359b.kt
./compiler/testData/codegen/box/inference/pcla/oneParameter/oneTypeVariable/oneTypeInfoOrigin/sourceSinkFeedContexts/ByAssignmentToALocalVariableYieldCase.kt
./compiler/testData/codegen/box/inference/pcla/oneParameter/oneTypeVariable/oneTypeInfoOrigin/typeInfoSinks/MutablePropertiesYieldCase.kt
./compiler/testData/codegen/box/initializers/initializers9.kt
./compiler/testData/codegen/box/jvmInlineMultiFieldValueClasses/valueClassInValueClass.kt
./compiler/testData/codegen/boxJvm/casts/kt55005.kt
./compiler/testData/codegen/boxJvm/delegation/delegationToIntersectionType2.kt
./compiler/testData/codegen/boxJvm/fir/vararg.kt
./compiler/testData/codegen/boxJvm/inference/pcla/issues/kt57709.kt
./compiler/testData/codegen/boxJvm/javaInterop/notNullAssertions/destructuringAssignmentWithNullabilityAssertionOnExtensionReceiver_lv12.kt
./compiler/testData/codegen/boxJvm/javaInterop/notNullAssertions/typeParameterWithMixedNullableAndNotNullableBounds.kt
./compiler/testData/codegen/boxJvm/specialBuiltins/weirdCharBuffers.kt
./compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordAnnotation.kt
./compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordAnnotationWithoutDefaultTarget.kt
./compiler/testData/ir/irText/classes/declarationOrder.kt
./compiler/testData/ir/irText/declarations/annotations/annotationRetentionsMultiModule.kt
./compiler/testData/ir/irText/declarations/annotations/specialAnnotationsMetadata.kt
./compiler/testData/ir/irText/expressions/badBreakContinue.kt
./compiler/testData/ir/irText/firProblems/FirBuilder.kt
./compiler/testData/ir/irText/firProblems/kt43342.kt

udalov

udalov · 2026-04-07T14:03:25Z

Other random things I noticed while reviewing the test data changed in this PR (probably to be done separately):

Now that K1 is no longer run on compiler/testData/diagnostics/jvmIntegration, these tests look very similar to compiler/testData/diagnostics/testsWithJvmBackend and probably should be merged.
There are still some occurrences of FIR_DIFFERENCE in the repo, e.g. in compiler/testData/diagnostics/testsWithJsStdLib
KT-85536 Obsolete comments in test data on the JSCODE_NO_JAVASCRIPT_PRODUCED diagnostic

sandwwraith

I noticed that some tests in testData/diagnostics/tests still have .fir versions (notably all crv-related ones). Do you plan to address this later?

ShikaSD · 2026-04-07T15:16:06Z

@demiurg906 I don't see any Compose changes here, is this JFYI or do expect a follow up PR from the Compose team?

dzharkov

FTR: Reviewed mostly non-backend parts

demiurg906 · 2026-04-08T06:30:32Z

@ShikaSD Aparently Github can't handle more than ~2k files in one PR. There are few renamed testdata files in compose tests in the following commits:

[K1 Tests] Delete K1 IR dumps. Part 2/4
[K1 Tests] Adjust full diagnostic text processing. Part 2/3

demiurg906 · 2026-04-08T06:31:02Z

@sandwwraith yep, I'll check them later, once this PR will land.

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

Delete `// FIR_IDENTICAL` directives from tests with IR dumps. ^KT-85292

Remove FIR_IDENTICAL processing from IR dump handlers ^KT-85292

Delete `.ranges.txt` dumps if `.fir.ranges.txt` dump exists. ^KT-85292

Rename `.fir.ranges.txt` dumps to `.ranges.txt` dump exists. ^KT-85292

Delete `// FIR_IDENTICAL` directives from source ranges tests. ^KT-85292

Remove `// FIR_IDENTICAL` processing from IrSourceRangesDumpHandler ^KT-85292

...from `.fir.ir.diag.txt` to `.ir.diag.txt`. ^KT-85292

…ureDumpHandler` ^KT-85292

Remove `.diag.txt` dumps if `.fir.diag.txt` exists. ^KT-85292

Rename `.fir.diag.txt` dumps to `.diag.txt`. ^KT-85292

Change target dump file extension in `FirDiagnosticsHandler` to `.diag.txt`. ^KT-85292

Delete `.asm.txt` dump if there is a `.asm.fir.txt` dump present. ^KT-85292

Rename `.asm.fir.txt` dumps `.asm.txt`. ^KT-85292

Delete FIR_DIFFERENCE directive from ASM tests. ^KT-85292

Delete support of K1 dumps from `AsmLikeInstructionListingHandler`. ^KT-85292

Delete `.cli.out` dump if there is a `.cli.fir.out` dump present. ^KT-85292

Rename `.cli.fir.out` dumps to `.cli.out`. ^KT-85292

Remove support of `.cli.fir.out` dumps from `NonSourceErrorMessagesHandler`. ^KT-85292

^KT-85292

Delete `.txt` dump if there is a `.fir.txt` dump present. ^KT-85292

Rename `.fir.txt` dump to `.txt`. ^KT-85292

Remove K1 dumps processing from `BytecodeListingHandler` ^KT-85292

KotlinBuild · 2026-04-08T13:55:00Z

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

Quality gate was triggered with the following revisions:

kotlin
Branch: refs/merge/GITHUB-5824/safe-merge
Commit: 03a9634

KotlinBuild · 2026-04-08T15:16:09Z

Triggered a retry attempt #1 out of 1.

KotlinBuild · 2026-04-08T15:44:42Z

Quality gate finished successfully (recovered via retry).

demiurg906 requested review from ShikaSD, ddolovov, dimonchik0036, dzharkov, sandwwraith and udalov April 7, 2026 10:30

demiurg906 assigned udalov Apr 7, 2026

KotlinBuild force-pushed the demiurg906/k1-tests-removal/test-data-cleanup branch from 1d39ce3 to 3d6aea3 Compare April 7, 2026 11:55

dimonchik0036 approved these changes Apr 7, 2026

View reviewed changes

udalov requested changes Apr 7, 2026

View reviewed changes

ddolovov previously approved these changes Apr 7, 2026

View reviewed changes

sandwwraith approved these changes Apr 7, 2026

View reviewed changes

dzharkov previously approved these changes Apr 7, 2026

View reviewed changes

KotlinBuild force-pushed the demiurg906/k1-tests-removal/test-data-cleanup branch from 3d6aea3 to 6e6178a Compare April 8, 2026 07:14

kotlin-safe-merge bot requested review from ddolovov and dzharkov April 8, 2026 07:15

ddolovov previously approved these changes Apr 8, 2026

View reviewed changes

demiurg906 requested a review from udalov April 8, 2026 08:55

demiurg906 added 24 commits April 8, 2026 13:52

[K1 Tests] Delete K1 IR dumps. Part 3/4

1d73be0

Delete `// FIR_IDENTICAL` directives from tests with IR dumps. ^KT-85292

[K1 Tests] Delete K1 IR dumps. Part 4/4

d93a7d8

Remove FIR_IDENTICAL processing from IR dump handlers ^KT-85292

[K1 Tests] Delete K1 source ranges dumps. Part 1/4

78a9138

Delete `.ranges.txt` dumps if `.fir.ranges.txt` dump exists. ^KT-85292

[K1 Tests] Delete K1 source ranges dumps. Part 2/4

db1f7e9

Rename `.fir.ranges.txt` dumps to `.ranges.txt` dump exists. ^KT-85292

[K1 Tests] Delete K1 source ranges dumps. Part 3/4

83aa1ff

Delete `// FIR_IDENTICAL` directives from source ranges tests. ^KT-85292

[K1 Tests] Delete K1 source ranges dumps. Part 4/4

2241770

Remove `// FIR_IDENTICAL` processing from IrSourceRangesDumpHandler ^KT-85292

[K1 Tests] Change target extension file of IrDiagnosticsHandler ...

6c91d57

...from `.fir.ir.diag.txt` to `.ir.diag.txt`. ^KT-85292

[K1 Tests] Remove K1-specific processing from `IrMangledNameAndSignat…

107eeac

…ureDumpHandler` ^KT-85292

[K1 Tests] Adjust full diagnostic text processing. Part 1/3

0605db8

Remove `.diag.txt` dumps if `.fir.diag.txt` exists. ^KT-85292

[K1 Tests] Adjust full diagnostic text processing. Part 2/3

bd6fd2a

Rename `.fir.diag.txt` dumps to `.diag.txt`. ^KT-85292

[K1 Tests] Adjust full diagnostic text processing. Part 3/3

d6a267d

Change target dump file extension in `FirDiagnosticsHandler` to `.diag.txt`. ^KT-85292

[K1 Tests] Delete K1 ASM dumps. Part 1/4

4b781f1

Delete `.asm.txt` dump if there is a `.asm.fir.txt` dump present. ^KT-85292

[K1 Tests] Delete K1 ASM dumps. Part 2/4

218d8ee

Rename `.asm.fir.txt` dumps `.asm.txt`. ^KT-85292

[K1 Tests] Delete K1 ASM dumps. Part 3/4

3c2b170

Delete FIR_DIFFERENCE directive from ASM tests. ^KT-85292

[K1 Tests] Delete K1 ASM dumps. Part 4/4

6f26659

Delete support of K1 dumps from `AsmLikeInstructionListingHandler`. ^KT-85292

[K1 Tests] Delete K1 CLI-like diagnostics output. Part 1/3

111e145

Delete `.cli.out` dump if there is a `.cli.fir.out` dump present. ^KT-85292

[K1 Tests] Delete K1 CLI-like diagnostics output. Part 2/3

a8083d3

Rename `.cli.fir.out` dumps to `.cli.out`. ^KT-85292

[K1 Tests] Delete K1 CLI-like diagnostics output. Part 3/3

8bc5bf0

Remove support of `.cli.fir.out` dumps from `NonSourceErrorMessagesHandler`. ^KT-85292

[K1 Tests] Simplify implementation of AbstractFirIdenticalChecker

e361ed1

^KT-85292

[K1 Tests] Delete descriptor dumps with new inference enabled

83a1e69

^KT-85292

[K1 Tests] Update testdata after previous commits

2619e96

^KT-85292

[K1 Tests] Delete K1 bytecode listing dumps. Part 1/3

a319a95

Delete `.txt` dump if there is a `.fir.txt` dump present. ^KT-85292

[K1 Tests] Delete K1 bytecode listing dumps. Part 2/3

dca0d93

Rename `.fir.txt` dump to `.txt`. ^KT-85292

[K1 Tests] Delete K1 bytecode listing dumps. Part 3/3

d1b8dd0

Remove K1 dumps processing from `BytecodeListingHandler` ^KT-85292

kotlin-safe-merge bot force-pushed the demiurg906/k1-tests-removal/test-data-cleanup branch from 1a5e842 to d1b8dd0 Compare April 8, 2026 13:53

KotlinBuild merged commit ccbef4c into master Apr 8, 2026
1 check passed

KotlinBuild deleted the demiurg906/k1-tests-removal/test-data-cleanup branch April 8, 2026 15:44

Conversation

demiurg906 commented Apr 7, 2026

Uh oh!

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

Uh oh!

Code Owners

Uh oh!

demiurg906 commented Apr 7, 2026

Uh oh!

KotlinBuild commented Apr 7, 2026

Uh oh!

KotlinBuild commented Apr 7, 2026

Uh oh!

KotlinBuild commented Apr 7, 2026

Uh oh!

udalov commented Apr 7, 2026

Uh oh!

udalov left a comment

Choose a reason for hiding this comment

Uh oh!

udalov commented Apr 7, 2026

Uh oh!

sandwwraith left a comment

Choose a reason for hiding this comment

Uh oh!

ShikaSD commented Apr 7, 2026

Uh oh!

dzharkov left a comment

Choose a reason for hiding this comment

Uh oh!

demiurg906 commented Apr 8, 2026

Uh oh!

demiurg906 commented Apr 8, 2026

Uh oh!

KotlinBuild commented Apr 8, 2026

Uh oh!

KotlinBuild commented Apr 8, 2026

Uh oh!

KotlinBuild commented Apr 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

kotlin-safe-merge bot commented Apr 7, 2026 •

edited

Loading