Kotlin: Support Kotlin 2.3.0-Beta2 #20965

andersfugmann · 2025-12-04T16:09:17Z

This PR add support for Kotlin 2.3.0-Beta2.

To support Kotlin 2.3.0-Beta2, and update of the rules_kotlin bazel package needs to be updated to 2.2.0. Unfortunatly that drops support for Kotlin 1.6.x and 1.7.x.

Copilot

Pull request overview

This PR adds support for Kotlin 2.3.0-Beta2 by updating the rules_kotlin Bazel package from version 2.1.3-codeql.1 to 2.2.0-codeql.1. This update necessarily drops support for Kotlin versions 1.6.x and 1.7.x.

Key Changes:

Updated rules_kotlin from 2.1.3-codeql.1 to 2.2.0-codeql.1 with updated dependencies and patches
Added support for Kotlin 2.3.0-Beta2 with version-specific compatibility files
Removed support for Kotlin 1.6.0, 1.6.20, 1.7.0, and 1.7.20 (dependencies and version-specific files)

Reviewed changes

Copilot reviewed 29 out of 29 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
`misc/bazel/registry/modules/rules_kotlin/metadata.json`	Updated to reference only the new 2.2.0-codeql.1 version
`misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/source.json`	New source configuration for rules_kotlin 2.2.0 with patch references
`misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/patches/*.patch`	Updated patch files for the new rules_kotlin version
`misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/MODULE.bazel`	New MODULE.bazel with updated dependencies (rules_android 0.6.4, protobuf 29.0, etc.)
`misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.1/source.json`	Removed old version configuration
`java/kotlin-extractor/versions.bzl`	Removed 1.6.x and 1.7.x versions, added 2.3.0-Beta2
`java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_3_0-Beta2/*.kt`	Added version-specific compatibility files for Kotlin 2.3.0-Beta2
`java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt`	Added `@Suppress("REDUNDANT_ELSE_IN_WHEN")` annotations for Kotlin 2.3 compatibility
`java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt`	Removed TODO comment and added suppression annotation
`java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt`	Added suppression annotations, explicit return type, and workaround for nullable delegate property
`java/kotlin-extractor/deps/*.jar`	Removed 1.6.x and 1.7.x dependency JARs, added 2.3.0-Beta2 JARs
`java/kotlin-extractor/BUILD.bazel`	Removed `resource_strip_prefix` configuration
`MODULE.bazel`	Updated rules_kotlin dependency and repository references

Comments suppressed due to low confidence (1)

misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/MODULE.bazel:10

There is a commented-out duplicate declaration of bazel_dep(name = "rules_java", version = "7.2.0") on line 10, with an active identical declaration on line 11. This commented line should be removed unless there's a specific reason to keep it.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

java/kotlin-extractor/BUILD.bazel

igfoo · 2025-12-05T13:17:56Z

If we're removing support for 1.6 and 1.7, then we should move (into v_1_8_0) or delete all the files in utils/versions/v_1_{6,7}*

...or/src/main/kotlin/utils/versions/v_2_3_0-Beta2/getJvmModuleNameForDeserializedDescriptor.kt

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_3_0-Beta2/Kotlin2ComponentRegistrar.kt

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

igfoo · 2025-12-05T13:28:10Z

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

+                    // For Kotlin < 2.3, s.delegate is not-nullable. Cast to a be nullable,
+                    // as a workaround to silence warnings for kotlin < 2.3 about the elvis
+                    // operator being redundant.
+                    // For Kotlin >= 2.3, the cast is redundant, so we need to silence that warning


Do you know why it is now nullable? Is that actually an error?

Tbh, I have not dug into why it can be nullable. Let me take a look at the API to understand if its an error if its null.

Copilot was very convincing in explaining that the delegate may become null after lowering. But as the extractor hooks into the pipeline before lowering, the delegate should always be set.

hfhbd · 2025-12-16T15:24:17Z

BTW Kotlin 2.3.0 is released, so you can update 2.3.0-Beta2 to 2.3.0

sgammon · 2025-12-31T23:55:37Z

@andersfugmann we are blocked on this, can i help in any way? i tried to complete it on our own fork but couldn't, for version 2.3.0

andersfugmann · 2026-01-05T09:48:23Z

Thanks for the offer to help @sgammon. We have been making progress and expect to have a working solution this week. Support for Kotlin 2.3 is expected to be available in CodeQL 2.24.1 (Early February)

andersfugmann · 2026-01-21T12:35:50Z

@igfoo, I'm marking as ready for review.

Addressed your review comments
Removed support for Kotlin 1.6 and 1.7, and removed versions files for these versions and cleaned up the versions files (Removing redundant files and applied/inlined files where there were only one file present under versions
I've accepted the test changes, which have been mainly column changes, apart from super constructors - see this comment.
Updated Kotlin assets to 2.3.0

igfoo · 2026-01-21T19:14:31Z

I think it would make sense to rebase away the 2.3.0-Beta2 jars.

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_3_0-Beta2/IrSimpleTypeImplCompat.kt

java/kotlin-extractor/src/main/kotlin/utils/versions/rollup.sh

java/kotlin-extractor/src/main/kotlin/utils/versions/unused/allOverriddenIncludingSelf.kt

igfoo · 2026-01-22T18:51:38Z

java/ql/integration-tests/kotlin/all-platforms/gradle_kotlinx_serialization/diag.expected

@@ -1,2 +0,0 @@
-| CodeQL Kotlin extractor | 5 |  | Unbound symbol found, skipping extraction of expression | app/src/main/kotlin/testProject/App.kt:7:1:8:55 | app/src/main/kotlin/testProject/App.kt:7:1:8:55 |
-| CodeQL Kotlin extractor | 5 |  | Unbound symbol found, skipping extraction of expression | app/src/main/kotlin/testProject/App.kt:14:1:17:1 | app/src/main/kotlin/testProject/App.kt:14:1:17:1 |


What happened here?

This is part of changes made to when deprecating support for Kotlin 1.6.0. See comment below

igfoo · 2026-01-22T18:52:22Z

java/ql/integration-tests/kotlin/all-platforms/gradle_kotlinx_serialization/PrintAst.expected

@@ -21,35 +21,6 @@ app/src/main/kotlin/testProject/App.kt:
 #    0|           0: [TypeAccess] int
 #    0|         3: [Parameter] serializationConstructorMarker
 #    0|           0: [TypeAccess] SerializationConstructorMarker
-#    7|       5: [BlockStmt] { ... }
-#    7|         0: [ExprStmt] <Expr>;


It looks like we lost lots of stuff; is that expected?

The test was initially run using Kotlin 1.6 for which support has been removed so had to be updated to Kotlin 1.8.
In Kotlin 1.6, the serialization plugin generated method bodies and made them visible to the IR, but in Kotlin 1.8, The plugin now uses a two-pass system (IrPreGenerator + SerializerIrGenerator), so the bodies are generated in a separate IR generation pass which is why we do not extract the bodies anymore.

I've tested the test changes on main, and observe the same, so this is not caused by changes needed to support Kotlin 2.3.

If we want to capture the function bodies, we can force the Kotlin extractor to be loaded last to be able to observe the function bodies.

diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorComponentRegistrar.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorComponentRegistrar.kt index 7fd6416dcd6..81e3c2bba36 100644 --- a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorComponentRegistrar.kt +++ b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorComponentRegistrar.kt @@ -4,6 +4,7 @@ package com.github.codeql import com.intellij.mock.MockProject +import com.intellij.openapi.extensions.LoadingOrder import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.config.CompilerConfiguration @@ -16,14 +17,18 @@ class KotlinExtractorComponentRegistrar : Kotlin2ComponentRegistrar() { if (invocationTrapFile == null) { throw Exception("Required argument for TRAP invocation file not given") } - IrGenerationExtension.registerExtension( - project, + // Register with LoadingOrder.LAST to ensure the extractor runs after other + // IR generation plugins (like kotlinx.serialization) have generated their code. + val extensionPoint = project.extensionArea.getExtensionPoint(IrGenerationExtension.extensionPointName) + extensionPoint.registerExtension( KotlinExtractorExtension( invocationTrapFile, configuration[KEY_CHECK_TRAP_IDENTICAL] ?: false, configuration[KEY_COMPILATION_STARTTIME], configuration[KEY_EXIT_AFTER_EXTRACTION] ?: false - ) + ), + LoadingOrder.LAST, + project ) } }

I can create a follow-up PR for that if we want this.

Sounds good; we do expect to be running last, so we're analysing the code that's actually executed.

redsun82

Bazel changes and testing some builds locally LGTM. Everything seems in order to me 👍

redsun82 · 2026-01-23T08:25:05Z

java/kotlin-extractor/BUILD.bazel

-                ("%s/" % package_name() if package_name() else "") +
-                v
-            ),
+            resource_strip_prefix = v,


I'm guessing the situation has improved since I did this, and the simple v is enough. making it work from @codeql is a nice to have, but it has to work from @codeql_kotlin_embeddable

I'm not familiar with the @codeql_kotlin_embeddable. Where are those needed, and, more importantly, how do I test them?

…6 and 1.7

…hanges introduced in Kotlin 2.3

This change rolls up all files from v1_6_0, v1_6_20, v1_7_0 and v_1_7_20. In addition, versioned files that are not overridden by any later Kotlin versions (i.e. files that only have one copy under utils/versions) are inlined and removed to simplify list of changes. List of removed/inlined files: allOverriddenIncludingSelf.kt copyTo.kt ExperimentalCompilerApi.kt getFileClassFqName.kt IsUnderscoreParameter.kt ReferenceEntity.kt SyntheticBodyKind.kt Types.kt withHasQuestionMark.kt

…n v2_3_0

…te is null

… for Kotlin 1.6 and 1.7

…test

…mpiler 1.8.10 and accept test changes

…o exist in the stdlib

Accept test changes from Kotlin 2.3.0 update Updates expected test outputs for kotlin2 library tests to match actual compiler output. Changes include: - Location adjustments for properties/methods (now point to identifiers) - CastExpr -> ImplicitCastExpr for implicit type casts - Removed duplicate BlockStmt entries in loop ASTs - Super constructor call location changes Note that in Kotlin 2.3.0 super constructor calls now have locations spanning entire class declarations instead of the actual super call site.

Copilot AI review requested due to automatic review settings December 4, 2025 16:09

andersfugmann requested review from a team as code owners December 4, 2025 16:09

github-actions bot added the Kotlin label Dec 4, 2025

Copilot started reviewing on behalf of andersfugmann December 4, 2025 16:10 View session

Copilot finished reviewing on behalf of andersfugmann December 4, 2025 16:12

Copilot AI reviewed Dec 4, 2025

View reviewed changes

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt Outdated Show resolved Hide resolved

java/kotlin-extractor/BUILD.bazel Outdated Show resolved Hide resolved

andersfugmann marked this pull request as draft December 5, 2025 10:06

igfoo reviewed Dec 5, 2025

View reviewed changes

...or/src/main/kotlin/utils/versions/v_2_3_0-Beta2/getJvmModuleNameForDeserializedDescriptor.kt Outdated Show resolved Hide resolved

igfoo reviewed Dec 5, 2025

View reviewed changes

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_3_0-Beta2/Kotlin2ComponentRegistrar.kt Outdated Show resolved Hide resolved

igfoo reviewed Dec 5, 2025

View reviewed changes

forketyfork mentioned this pull request Dec 17, 2025

Support Kotlin 2.3.0 #20661

Open

afranken mentioned this pull request Dec 18, 2025

Bump kotlin.version from 2.2.21 to 2.3.0 adobe/S3Mock#2851

Merged

This was referenced Dec 18, 2025

chore: bumped to jdk25 navikt/pdfgen#437

Merged

Codeql kotlin 2.3.0 support MikAoJk/kotlin-ktor-crud-rest-api#114

Closed

ArnyminerZ mentioned this pull request Dec 23, 2025

Upgrade Kotlin to 2.3.0 bitfireAT/davx5-ose#1895

Closed

PattaFeuFeu mentioned this pull request Dec 24, 2025

Bump kotlin from 2.2.21 to 2.3.0 PattaFeuFeu/bigbone#650

Open

mikehardy mentioned this pull request Dec 27, 2025

build(deps): kotlin 2.3.0 ankidroid/Anki-Android#19945

Draft

5 tasks

sleberknight mentioned this pull request Dec 29, 2025

Bump the prod-deps group with 2 updates sleberknight/kiwi-beta#581

Merged

Yolgie mentioned this pull request Jan 4, 2026

chore(deps): bump kotlin from 2.2.21 to 2.3.0 boudicca-events/boudicca.events#904

Open

This was referenced Jan 5, 2026

Bump kotlin.version from 2.2.21 to 2.3.0 navikt/pensjonssimulator#297

Open

Bump kotlin.version from 2.2.21 to 2.3.0 navikt/pensjonskalkulator-backend#349

Open

Bump kotlin.version from 2.2.21 to 2.3.0 navikt/pensjon-selvbetjening-opptjening-backend#315

Open

andersfugmann force-pushed the andersfugmann/kotlin_2.3.0-beta2 branch from 2e8db58 to be03a72 Compare January 5, 2026 16:16

andersfugmann force-pushed the andersfugmann/kotlin_2.3.0-beta2 branch from 0063f48 to aa9dd59 Compare January 22, 2026 12:04

igfoo reviewed Jan 22, 2026

View reviewed changes

redsun82 previously approved these changes Jan 23, 2026

View reviewed changes

andersfugmann dismissed redsun82’s stale review via 1e9864d January 23, 2026 10:46

andersfugmann added 23 commits January 23, 2026 13:18

Kotlin: Update kotlin_rules to 2.2.0 and remove support for Kotlin 1.…

7722068

…6 and 1.7

Kotlin: Remove resource_strip_prefix for kotlin extraction

79ce26b

Kotlin: Silence compilation warnings

0350521

Kotlin: Add support for Kotlin 2.3.0

a8e6d32

Kotlin: Update compiler plugin for Kotlin 2.3.0

62891de

Kotlin: Fix bazel format and address copilot review comments

d514516

Kotlin: Strip prefix when building plugin

b3ff9c5

Kotlin: Create IrSimpleType factory function to support constructor c…

6f5ff01

…hanges introduced in Kotlin 2.3

Kotlin: Fix spelling

783f805

Kotlin: Remove obsolete file

2dd4b73

Kotlin: Add additional warning suppresion to v1_9_0 and remove copy i…

8fb2b26

…n v2_3_0

Kotlin: Do not skip writing of getter and setters if the local deliga…

6852a54

…te is null

Kotlin: Add changenotes for Kotlin 2.3 support and removal of support…

1c1e17c

… for Kotlin 1.6 and 1.7

Kotlin: Bump versions in documentation

3d123c8

Kotlin: Bump upper bound for supported kotlin version in integration …

19d4ce2

…test

Kotlin: Update kotlin compiler version in integration tests

6b7005b

Kotlin: Update kotlin serialization integration test to use Kotlin co…

8289f2a

…mpiler 1.8.10 and accept test changes

Kotlin: Accept column location changes in tests

01acfac

Kotlin: Add bitwise 'and' operation expected by Kotlin 2.3 compiler t…

f4995c6

…o exist in the stdlib

Kotlin: Accept test changes

d8fd574

Kotlin: Address detections from kotin internal queries

f296f8d

andersfugmann force-pushed the andersfugmann/kotlin_2.3.0-beta2 branch from 1e9864d to f296f8d Compare January 23, 2026 12:18

		@@ -1,2 +0,0 @@
		\| CodeQL Kotlin extractor \| 5 \| \| Unbound symbol found, skipping extraction of expression \| app/src/main/kotlin/testProject/App.kt:7:1:8:55 \| app/src/main/kotlin/testProject/App.kt:7:1:8:55 \|
		\| CodeQL Kotlin extractor \| 5 \| \| Unbound symbol found, skipping extraction of expression \| app/src/main/kotlin/testProject/App.kt:14:1:17:1 \| app/src/main/kotlin/testProject/App.kt:14:1:17:1 \|

Kotlin: Support Kotlin 2.3.0-Beta2 #20965

Are you sure you want to change the base?

Kotlin: Support Kotlin 2.3.0-Beta2 #20965

Uh oh!

Conversation

andersfugmann commented Dec 4, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

igfoo commented Dec 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hfhbd commented Dec 16, 2025

Uh oh!

sgammon commented Dec 31, 2025

Uh oh!

andersfugmann commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andersfugmann commented Jan 21, 2026

Uh oh!

igfoo commented Jan 21, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

redsun82 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

andersfugmann commented Jan 5, 2026 •

edited

Loading