Skip to content

Kotlin: clean up alternate-version code now that v1.5.x support is dropped #19496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smowton merged 2 commits into from
Jun 18, 2025
Merged

Kotlin: clean up alternate-version code now that v1.5.x support is dropped #19496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79171a9
Fold v_1_5_0 and v_1_5_20 files forwards into v_1_6_0, dropping any t…
smowton May 15, 2025
084222e
Inline version-specific override code where there is now only one ver…
smowton May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8053,7 +8053,7 @@ open class KotlinFileExtractor(
?.symbol
?.typeWithArguments(listOf(functionNTypeArguments.last()))
else
functionN(pluginContext)(functionNTypeArguments.size - 1)
pluginContext.irBuiltIns.functionN(functionNTypeArguments.size - 1)
.symbol
.typeWithArguments(functionNTypeArguments)

Expand Down
3 changes: 1 addition & 2 deletions java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.github.codeql

import com.github.codeql.utils.versions.copyParameterToFunction
import com.github.codeql.utils.versions.createImplicitParameterDeclarationWithWrappedDescriptor
import com.github.codeql.utils.versions.getAnnotationType
import java.lang.annotation.ElementType
import java.util.HashSet
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
Expand Down Expand Up @@ -375,7 +374,7 @@ class MetaAnnotationSupport(
.apply {
createImplicitParameterDeclarationWithWrappedDescriptor()
parent = annotationClass
superTypes = listOf(getAnnotationType(pluginContext))
superTypes = listOf(pluginContext.irBuiltIns.annotationType)
}

val propertyName = Name.identifier("value")
Expand Down
5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IrBuiltIns.kt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt
View file
Open in desktop

This file was deleted.

0 ...n/utils/versions/v_1_5_0/CodeQLIrConst.kt → ...n/utils/versions/v_1_6_0/CodeQLIrConst.kt
View file
Open in desktop
File renamed without changes.
0 ...in/utils/versions/v_1_5_0/CodeQLIsRoot.kt → ...in/utils/versions/v_1_6_0/CodeQLIsRoot.kt
View file
Open in desktop
File renamed without changes.
0 ...ons/v_1_5_0/CommentExtractorLighterAST.kt → ...ons/v_1_6_0/CommentExtractorLighterAST.kt
View file
Open in desktop
File renamed without changes.
0 ...rsions/v_1_5_0/ExperimentalCompilerApi.kt → ...rsions/v_1_6_0/ExperimentalCompilerApi.kt
View file
Open in desktop
File renamed without changes.
0 ...sions/v_1_5_0/FirMetadataSourceFirFile.kt → ...sions/v_1_6_0/FirMetadataSourceFirFile.kt
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt
View file
Open in desktop

This file was deleted.

0 .../utils/versions/v_1_5_0/IrLazyFunction.kt → .../utils/versions/v_1_6_0/IrLazyFunction.kt
View file
Open in desktop
File renamed without changes.
0 ...ils/versions/v_1_5_0/IrSymbolInternals.kt → ...ils/versions/v_1_6_0/IrSymbolInternals.kt
View file
Open in desktop
File renamed without changes.
0 ...otlin/utils/versions/v_1_5_0/IrVisitor.kt → ...otlin/utils/versions/v_1_6_0/IrVisitor.kt
View file
Open in desktop
File renamed without changes.
0 ...versions/v_1_5_0/IsUnderscoreParameter.kt → ...versions/v_1_6_0/IsUnderscoreParameter.kt
View file
Open in desktop
File renamed without changes.
0 ..._1_5_0/JvmDefaultModeIsNoCompatibility.kt → ..._1_6_0/JvmDefaultModeIsNoCompatibility.kt
View file
Open in desktop
File renamed without changes.
0 ...ions/v_1_5_0/Kotlin2ComponentRegistrar.kt → ...ions/v_1_6_0/Kotlin2ComponentRegistrar.kt
View file
Open in desktop
File renamed without changes.
0 ...versions/v_1_5_0/LinesOfCodeLighterAST.kt → ...versions/v_1_6_0/LinesOfCodeLighterAST.kt
View file
Open in desktop
File renamed without changes.
0 .../kotlin/utils/versions/v_1_5_20/Psi2Ir.kt → ...n/kotlin/utils/versions/v_1_6_0/Psi2Ir.kt
View file
Open in desktop
File renamed without changes.
0 ...utils/versions/v_1_5_0/ReferenceEntity.kt → ...utils/versions/v_1_6_0/ReferenceEntity.kt
View file
Open in desktop
File renamed without changes.
0 ...ils/versions/v_1_5_0/SyntheticBodyKind.kt → ...ils/versions/v_1_6_0/SyntheticBodyKind.kt
View file
Open in desktop
File renamed without changes.
0 ...in/kotlin/utils/versions/v_1_5_0/Types.kt → ...in/kotlin/utils/versions/v_1_6_0/Types.kt
View file
Open in desktop
File renamed without changes.
0 ...n/kotlin/utils/versions/v_1_5_0/UsesK2.kt → ...n/kotlin/utils/versions/v_1_6_0/UsesK2.kt
View file
Open in desktop
File renamed without changes.
0 .../v_1_5_0/VirtualFileBasedSourceElement.kt → .../v_1_6_0/VirtualFileBasedSourceElement.kt
View file
Open in desktop
File renamed without changes.
0 ...ons/v_1_5_0/allOverriddenIncludingSelf.kt → ...ons/v_1_6_0/allOverriddenIncludingSelf.kt
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt
View file
Open in desktop

This file was deleted.

0 ...n/kotlin/utils/versions/v_1_5_0/copyTo.kt → ...n/kotlin/utils/versions/v_1_6_0/copyTo.kt
View file
Open in desktop
File renamed without changes.
0 ...ameterDeclarationWithWrappedDescriptor.kt → ...ameterDeclarationWithWrappedDescriptor.kt
View file
Open in desktop
File renamed without changes.
0 ...ls/versions/v_1_5_0/getFileClassFqName.kt → ...ls/versions/v_1_6_0/getFileClassFqName.kt
View file
Open in desktop
File renamed without changes.
0 ...ils/versions/v_1_5_0/getJvmDefaultMode.kt → ...ils/versions/v_1_6_0/getJvmDefaultMode.kt
View file
Open in desktop
File renamed without changes.
0 ...n/utils/versions/v_1_5_0/getKotlinType.kt → ...n/utils/versions/v_1_6_0/getKotlinType.kt
View file
Open in desktop
File renamed without changes.
0 ...ls/versions/v_1_5_0/isDispatchReceiver.kt → ...ls/versions/v_1_6_0/isDispatchReceiver.kt
View file
Open in desktop
File renamed without changes.
0 ...n/utils/versions/v_1_5_0/packageFqName.kt → ...n/utils/versions/v_1_6_0/packageFqName.kt
View file
Open in desktop
File renamed without changes.
0 ...1_5_0/parameterIndexExcludingReceivers.kt → ...1_6_0/parameterIndexExcludingReceivers.kt
View file
Open in desktop
File renamed without changes.
0 .../kotlin/utils/versions/v_1_5_0/parents.kt → .../kotlin/utils/versions/v_1_6_0/parents.kt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...otlin/utils/versions/v_1_5_0/typeUtils.kt → ...otlin/utils/versions/v_1_6_0/typeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.codeql.utils.versions

import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.IrBuiltIns

fun IrType.isNullableCodeQL(): Boolean =
this.isNullable()
Expand Down
0 ...s/versions/v_1_5_0/withHasQuestionMark.kt → ...s/versions/v_1_6_0/withHasQuestionMark.kt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.github.codeql.utils.versions

import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.IrBuiltIns

fun IrType.isNullableCodeQL(): Boolean =
this.isNullable()
Expand Down