Merge pull request #21915 from david-allison/kotlin-dropped-class

Kotlin: Fix findTopLevelPropertyOrWarn for K2 compiler

Author: andersfugmann

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

@@ -3905,7 +3905,14 @@ open class KotlinFileExtractor(
 
         val prop =
             getPropertiesByFqName(pluginContext, propertyPkg, propertyName)
-                .firstOrNull { it.owner.parentClassOrNull?.fqNameWhenAvailable?.asString() == type }
+                .firstOrNull {
+                    val owner = it.owner
+                    when (val parent = owner.parent) {
+                        is IrClass -> parent.fqNameWhenAvailable?.asString()
+                        is IrExternalPackageFragment -> getFileClassFqName(owner)?.asString()
+                        else -> null
+                    } == type
+                }
                 ?.owner
 
         if (prop != null) {

java/ql/lib/change-notes/2026-05-30-kclass-java-arg-k2-fix.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed an issue where `Foo::class.java` arguments were dropped during extraction under the Kotlin K2 compiler, which could cause false positives in queries such as `java/android/implicit-pendingintents`.

java/ql/test-kotlin1/library-tests/kclass-java-arg/test.expected

@@ -0,0 +1 @@
+| consume | Class<Target> |

java/ql/test-kotlin1/library-tests/kclass-java-arg/test.kt

@@ -0,0 +1,10 @@
+class Target
+
+class KClassJavaArg {
+    fun consume(c: Class<*>) {}
+
+    fun test() {
+        // `Target::class.java` must be extracted as the argument to `consume`.
+        consume(Target::class.java)
+    }
+}

java/ql/test-kotlin1/library-tests/kclass-java-arg/test.ql

@@ -0,0 +1,5 @@
+import java
+
+from MethodCall mc, Argument arg
+where mc.getMethod().hasName("consume") and arg = mc.getAnArgument()
+select mc.getMethod().getName(), arg.getType().getName()

java/ql/test-kotlin2/library-tests/kclass-java-arg/test.expected

@@ -0,0 +1 @@
+| consume | Class<Target> |

java/ql/test-kotlin2/library-tests/kclass-java-arg/test.kt

@@ -0,0 +1,10 @@
+class Target
+
+class KClassJavaArg {
+    fun consume(c: Class<*>) {}
+
+    fun test() {
+        // `Target::class.java` must be extracted as the argument to `consume`.
+        consume(Target::class.java)
+    }
+}

java/ql/test-kotlin2/library-tests/kclass-java-arg/test.ql

@@ -0,0 +1,5 @@
+import java
+
+from MethodCall mc, Argument arg
+where mc.getMethod().hasName("consume") and arg = mc.getAnArgument()
+select mc.getMethod().getName(), arg.getType().getName()