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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

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
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