Kotlin: Create IrSimpleType factory function to support constructor changes introduced in Kotlin 2.3

Author: andersfugmann

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

@@ -725,7 +725,7 @@ open class KotlinUsesExtractor(
                     componentType.isNullableCodeQL()
             if (unchanged) arrayType
             else
-                IrSimpleTypeImpl(
+                codeqlIrSimpleTypeImpl(
                     arrayType.classifier,
                     true,
                     listOf(makeTypeProjection(componentTypeBroadened, Variance.INVARIANT)),

java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt

@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.ir.types.IrStarProjection
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.IrTypeArgument
 import org.jetbrains.kotlin.ir.types.IrTypeProjection
-import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
 import org.jetbrains.kotlin.ir.types.impl.IrStarProjectionImpl
 import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
 import org.jetbrains.kotlin.ir.util.*
@@ -61,7 +60,7 @@ private fun IrSimpleType.substituteTypeArguments(
             }
         }
 
-    return IrSimpleTypeImpl(classifier, isNullableCodeQL(), newArguments, annotations)
+    return codeqlIrSimpleTypeImpl(classifier, isNullableCodeQL(), newArguments, annotations)
 }
 
 /**

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

@@ -0,0 +1,19 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
+import org.jetbrains.kotlin.ir.types.IrSimpleType
+import org.jetbrains.kotlin.ir.types.IrTypeArgument
+import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
+
+fun codeqlIrSimpleTypeImpl(
+    classifier: IrClassifierSymbol,
+    isNullable: Boolean,
+    arguments: List<IrTypeArgument>,
+    annotations: List<IrConstructorCall>
+): IrSimpleType = IrSimpleTypeImpl(
+    classifier,
+    isNullable,
+    arguments,
+    annotations
+)

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

@@ -0,0 +1,21 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
+import org.jetbrains.kotlin.ir.types.IrSimpleType
+import org.jetbrains.kotlin.ir.types.IrTypeArgument
+import org.jetbrains.kotlin.ir.types.SimpleTypeNullability
+import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
+
+fun codeqlIrSimpleTypeImpl(
+    classifier: IrClassifierSymbol,
+    isNullable: Boolean,
+    arguments: List<IrTypeArgument>,
+    annotations: List<IrConstructorCall>
+): IrSimpleType = IrSimpleTypeImpl(
+    classifier,
+    SimpleTypeNullability.fromHasQuestionMark(isNullable),
+    arguments,
+    annotations,
+    null  // originalKotlinType - explicitly pass null to avoid default parameter issues
+)