Merge pull request #9290 from igfoo/igfoo/kotlin1.7

Kotlin: Add support for the 1.7 RC

Author: igfoo

java/kotlin-extractor/build.gradle

@@ -35,6 +35,7 @@ sourceSets {
                     "utils/versions/v_1_5_21/*.kt",
                     "utils/versions/v_1_5_31/*.kt",
                     "utils/versions/v_1_6_10/*.kt",
+                    "utils/versions/v_1_7_0-RC/*.kt",
                     // "utils/versions/v_1_6_20/*.kt",
             ]
         }

java/kotlin-extractor/build.py

@@ -21,6 +21,8 @@ def parse_args():
                         help='Build for all versions/kinds')
     parser.add_argument('--single', action='store_false',
                         dest='many', help='Build for a single version/kind')
+    parser.add_argument('--single-version',
+                        help='Build for a specific version/kind')
     return parser.parse_args()
 
 
@@ -174,8 +176,8 @@ def compile(jars, java_jars, dependency_folder, transform_to_embeddable, output,
 
     for v in kotlin_plugin_versions.many_versions:
         if v != version:
-            shutil.rmtree(
-                tmp_dir + '/main/kotlin/utils/versions/v_' + v.replace('.', '_'))
+            d = tmp_dir + '/main/kotlin/utils/versions/v_' + v.replace('.', '_')
+            shutil.rmtree(d)
 
     srcs = find_sources(tmp_dir)
 
@@ -205,7 +207,9 @@ def compile_standalone(version):
             'build/temp_src',
             version)
 
-if args.many:
+if args.single_version:
+    compile_standalone(args.single_version)
+elif args.many:
     for version in kotlin_plugin_versions.many_versions:
         compile_standalone(version)
         compile_embeddable(version)

java/kotlin-extractor/kotlin_plugin_versions.py

@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 import platform
 import re
 import shutil
@@ -19,7 +21,7 @@ def version_string_to_tuple(version):
     m = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)', version)
     return tuple([int(m.group(i)) for i in range(1, 4)])
 
-many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.21', '1.5.31', '1.6.10', '1.6.20' ]
+many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.21', '1.5.31', '1.6.10', '1.7.0-RC', '1.6.20' ]
 
 many_versions_tuples = [version_string_to_tuple(v) for v in many_versions]
 

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

@@ -2,6 +2,7 @@ package com.github.codeql.utils
 
 import com.github.codeql.KotlinUsesExtractor
 import com.github.codeql.getJavaEquivalentClassId
+import com.github.codeql.utils.versions.codeQlWithHasQuestionMark
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
 import org.jetbrains.kotlin.backend.common.lower.parents
@@ -66,7 +67,7 @@ private fun subProjectedType(substitutionMap: Map<IrTypeParameterSymbol, IrTypeA
             if (conflictingVariance(outerVariance, substitutedTypeArg.variance))
                 IrStarProjectionImpl
             else {
-                val newProjectedType = substitutedTypeArg.type.let { if (t.hasQuestionMark) it.withHasQuestionMark(true) else it }
+                val newProjectedType = substitutedTypeArg.type.let { if (t.hasQuestionMark) it.codeQlWithHasQuestionMark(true) else it }
                 val newVariance = combineVariance(outerVariance, substitutedTypeArg.variance)
                 makeTypeProjection(newProjectedType, newVariance)
             }
@@ -191,7 +192,7 @@ fun IrTypeArgument.withQuestionMark(b: Boolean): IrTypeArgument =
         is IrStarProjection -> this
         is IrTypeProjection ->
             this.type.let { when(it) {
-                is IrSimpleType -> if (it.hasQuestionMark == b) this else makeTypeProjection(it.withHasQuestionMark(b), this.variance)
+                is IrSimpleType -> if (it.hasQuestionMark == b) this else makeTypeProjection(it.codeQlWithHasQuestionMark(b), this.variance)
                 else -> this
             }}
         else -> this

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/withHasQuestionMark.kt

@@ -0,0 +1,8 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+
+fun IrType.codeQlWithHasQuestionMark(b : Boolean): IrType {
+    return this.withHasQuestionMark(b)
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt

@@ -0,0 +1,8 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+
+fun IrType.codeQlWithHasQuestionMark(b : Boolean): IrType {
+    return this.withHasQuestionMark(b)
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/withHasQuestionMark.kt

@@ -0,0 +1,8 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+
+fun IrType.codeQlWithHasQuestionMark(b : Boolean): IrType {
+    return this.withHasQuestionMark(b)
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/withHasQuestionMark.kt

@@ -0,0 +1,8 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+
+fun IrType.codeQlWithHasQuestionMark(b : Boolean): IrType {
+    return this.withHasQuestionMark(b)
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_31/withHasQuestionMark.kt

@@ -0,0 +1,8 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+
+fun IrType.codeQlWithHasQuestionMark(b : Boolean): IrType {
+    return this.withHasQuestionMark(b)
+}

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_10/withHasQuestionMark.kt

@@ -0,0 +1,8 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.withHasQuestionMark
+
+fun IrType.codeQlWithHasQuestionMark(b : Boolean): IrType {
+    return this.withHasQuestionMark(b)
+}