Merge pull request #10921 from smowton/smowton/fix/ignore-enhanced-nullability

Kotlin: ignore enhanced nullability when extracting primitive types

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

@@ -2,6 +2,7 @@ package com.github.codeql
 
 import com.github.codeql.utils.*
 import com.github.codeql.utils.versions.codeQlWithHasQuestionMark
+import com.github.codeql.utils.versions.getKotlinType
 import com.github.codeql.utils.versions.isRawType
 import com.semmle.extractor.java.OdasaOutput
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -22,6 +23,7 @@ import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.java.sources.JavaSourceElement
 import org.jetbrains.kotlin.load.java.structure.*
+import org.jetbrains.kotlin.load.java.typeEnhancement.hasEnhancedNullability
 import org.jetbrains.kotlin.load.kotlin.getJvmModuleNameForDeserializedDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.NameUtils
@@ -674,7 +676,8 @@ open class KotlinUsesExtractor(
                           otherIsPrimitive: Boolean,
                           javaClass: IrClass,
                           kotlinPackageName: String, kotlinClassName: String): TypeResults {
-            val javaResult = if ((context == TypeContext.RETURN || (context == TypeContext.OTHER && otherIsPrimitive)) && !s.isNullable() && primitiveName != null) {
+            // Note the use of `hasEnhancedNullability` here covers cases like `@NotNull Integer`, which must be extracted as `Integer` not `int`.
+            val javaResult = if ((context == TypeContext.RETURN || (context == TypeContext.OTHER && otherIsPrimitive)) && !s.isNullable() && getKotlinType(s)?.hasEnhancedNullability() != true && primitiveName != null) {
                     val label: Label<DbPrimitive> = tw.getLabelFor("@\"type;$primitiveName\"", {
                         tw.writePrimitives(it, primitiveName)
                     })

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

@@ -0,0 +1,6 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrSimpleType
+import org.jetbrains.kotlin.ir.types.impl.IrTypeBase
+
+fun getKotlinType(s: IrSimpleType) = (s as? IrTypeBase)?.kotlinType

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_7_0/getKotlinType.kt

@@ -0,0 +1,5 @@
+package com.github.codeql.utils.versions
+
+import org.jetbrains.kotlin.ir.types.IrSimpleType
+
+fun getKotlinType(s: IrSimpleType) = s.kotlinType

java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/NotNull.java

@@ -0,0 +1,6 @@
+package org.jetbrains.annotations;
+import java.lang.annotation.*;
+
+// Stub of @NotNull:
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.TYPE_USE})
+public @interface NotNull { }

java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/Test.java

@@ -0,0 +1,7 @@
+import org.jetbrains.annotations.NotNull;
+
+public class Test {
+
+  public @NotNull Integer f(@NotNull Integer p) { return p; }
+
+}

java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/test.expected

@@ -0,0 +1,14 @@
+exprs
+| Test.java:5:19:5:25 | Integer | Integer |
+| Test.java:5:38:5:44 | Integer | Integer |
+| Test.java:5:58:5:58 | p | Integer |
+| user.kt:2:3:2:16 | x | int |
+| user.kt:2:11:2:11 | t | Test |
+| user.kt:2:13:2:16 | <implicit not null> | int |
+| user.kt:2:13:2:16 | f(...) | Integer |
+| user.kt:2:13:2:16 | int | int |
+| user.kt:2:15:2:15 | 5 | int |
+| user.kt:3:10:3:10 | x | int |
+#select
+| Test.java:5:27:5:27 | f | Integer |
+| user.kt:1:1:4:1 | f | Test |

java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/test.py

@@ -0,0 +1,6 @@
+from create_database_utils import *
+import glob
+
+os.mkdir('build')
+runSuccessfully(["javac"] + glob.glob("*.java") + ["-d", "build"])
+run_codeql_database_create(["javac " + " ".join(glob.glob("*.java")) + " -d build", "kotlinc user.kt -cp build"], lang="java")

java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/test.ql

@@ -0,0 +1,9 @@
+import java
+
+query predicate exprs(Expr e, string t) {
+  e.getEnclosingCallable().getDeclaringType().fromSource() and t = e.getType().toString()
+}
+
+from Method m
+where m.fromSource()
+select m, m.getAParamType().toString()

java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/user.kt

@@ -0,0 +1,4 @@
+fun f(t: Test): Int {
+  val x = t.f(5)
+  return x
+}