From 084222ec58383afa2b3ed96c93998786c9354df9 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Thu, 15 May 2025 12:07:23 +0100 Subject: [PATCH] Inline version-specific override code where there is now only one version --- java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt | 2 +- .../src/main/kotlin/MetaAnnotationSupport.kt | 3 +-- .../src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt | 5 ----- .../src/main/kotlin/utils/versions/v_1_6_0/Functions.kt | 5 ----- .../src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt | 5 ----- .../src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt | 5 ----- .../src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt | 1 + .../main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt | 1 + 8 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt delete mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt delete mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt delete mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt index 690372d67f5..376736611d1 100644 --- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt +++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt @@ -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) diff --git a/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt b/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt index e591eed3eca..368600267c1 100644 --- a/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt +++ b/java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt @@ -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 @@ -375,7 +374,7 @@ class MetaAnnotationSupport( .apply { createImplicitParameterDeclarationWithWrappedDescriptor() parent = annotationClass - superTypes = listOf(getAnnotationType(pluginContext)) + superTypes = listOf(pluginContext.irBuiltIns.annotationType) } val propertyName = Name.identifier("value") diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt deleted file mode 100644 index 18308780bff..00000000000 --- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/FileEntry.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.codeql.utils.versions - -import org.jetbrains.kotlin.ir.IrFileEntry - -typealias FileEntry = IrFileEntry diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt deleted file mode 100644 index 7d6c3eda8c3..00000000000 --- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.codeql.utils.versions - -import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext - -fun functionN(pluginContext: IrPluginContext) = pluginContext.irBuiltIns::functionN diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt deleted file mode 100644 index 1bb2ca62aa2..00000000000 --- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.codeql.utils.versions - -import org.jetbrains.kotlin.ir.IrBuiltIns - -typealias IrBuiltIns = org.jetbrains.kotlin.ir.IrBuiltIns diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt deleted file mode 100644 index d51db5eb05c..00000000000 --- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.codeql.utils.versions - -import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext - -fun getAnnotationType(context: IrPluginContext) = context.irBuiltIns.annotationType diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt index 06829377a6b..3724cafaab9 100644 --- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/typeUtils.kt @@ -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() diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt index ac34e633116..c6ffb89015e 100644 --- a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_1_20-Beta1/typeUtils.kt @@ -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()