Kotlin: Specialise findSubType to IrDeclaration

igfoo · igfoo · commit 12eab3d7f097 · 2022-08-25T10:11:19.000+01:00
We only use it on that type, and this makes the uses a bit quieter.
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -1568,7 +1568,7 @@ open class KotlinFileExtractor(
         }
     }
 
-    private fun findFunction(cls: IrClass, name: String): IrFunction? = cls.declarations.findSubType<IrDeclaration,IrFunction> { it.name.asString() == name }
+    private fun findFunction(cls: IrClass, name: String): IrFunction? = cls.declarations.findSubType<IrFunction> { it.name.asString() == name }
 
     val jvmIntrinsicsClass by lazy {
         val result = pluginContext.referenceClass(FqName("kotlin.jvm.internal.Intrinsics"))?.owner
@@ -1625,7 +1625,7 @@ open class KotlinFileExtractor(
     }
 
     val stringValueOfObjectMethod by lazy {
-        val result = javaLangString?.declarations?.findSubType<IrDeclaration,IrFunction> {
+        val result = javaLangString?.declarations?.findSubType<IrFunction> {
             it.name.asString() == "valueOf" &&
             it.valueParameters.size == 1 &&
             it.valueParameters[0].type == pluginContext.irBuiltIns.anyNType
@@ -1637,7 +1637,7 @@ open class KotlinFileExtractor(
     }
 
     val objectCloneMethod by lazy {
-        val result = javaLangObject?.declarations?.findSubType<IrDeclaration,IrFunction> {
+        val result = javaLangObject?.declarations?.findSubType<IrFunction> {
             it.name.asString() == "clone"
         }
         if (result == null) {
@@ -1653,7 +1653,7 @@ open class KotlinFileExtractor(
     }
 
     val kotlinNoWhenBranchMatchedConstructor by lazy {
-        val result = kotlinNoWhenBranchMatchedExn?.declarations?.findSubType<IrDeclaration,IrConstructor> {
+        val result = kotlinNoWhenBranchMatchedExn?.declarations?.findSubType<IrConstructor> {
             it.valueParameters.isEmpty()
         }
         if (result == null) {
@@ -1775,7 +1775,7 @@ open class KotlinFileExtractor(
                     return
                 }
 
-                val func = ((c.getTypeArgument(0) as? IrSimpleType)?.classifier?.owner as? IrClass)?.declarations?.findSubType<IrDeclaration,IrFunction> { it.name.asString() == fnName }
+                val func = ((c.getTypeArgument(0) as? IrSimpleType)?.classifier?.owner as? IrClass)?.declarations?.findSubType<IrFunction> { it.name.asString() == fnName }
                 if (func == null) {
                     logger.errorElement("Couldn't find function $fnName on enum type", c)
                     return
@@ -2225,7 +2225,7 @@ open class KotlinFileExtractor(
                         logger.errorElement("Argument to dataClassArrayMemberToString not a class", c)
                         return
                     }
-                    val realCallee = javaUtilArrays?.declarations?.findSubType<IrDeclaration,IrFunction> { decl ->
+                    val realCallee = javaUtilArrays?.declarations?.findSubType<IrFunction> { decl ->
                         decl.name.asString() == "toString" && decl.valueParameters.size == 1 &&
                                 decl.valueParameters[0].type.classOrNull?.let { it == realArrayClass } == true
                     }
@@ -2252,7 +2252,7 @@ open class KotlinFileExtractor(
                         logger.errorElement("Argument to dataClassArrayMemberHashCode not a class", c)
                         return
                     }
-                    val realCallee = javaUtilArrays?.declarations?.findSubType<IrDeclaration,IrFunction> { decl ->
+                    val realCallee = javaUtilArrays?.declarations?.findSubType<IrFunction> { decl ->
                         decl.name.asString() == "hashCode" && decl.valueParameters.size == 1 &&
                                 decl.valueParameters[0].type.classOrNull?.let { it == realArrayClass } == true
                     }
@@ -4363,7 +4363,7 @@ open class KotlinFileExtractor(
                         return
                     }
 
-                    val invokeMethod = functionType.classOrNull?.owner?.declarations?.findSubType<IrDeclaration,IrFunction> { it.name.asString() == OperatorNameConventions.INVOKE.asString()}
+                    val invokeMethod = functionType.classOrNull?.owner?.declarations?.findSubType<IrFunction> { it.name.asString() == OperatorNameConventions.INVOKE.asString()}
                     if (invokeMethod == null) {
                         logger.errorElement("Couldn't find `invoke` method on functional interface.", e)
                         return
@@ -4374,7 +4374,7 @@ open class KotlinFileExtractor(
                         logger.errorElement("Expected to find SAM conversion to IrClass. Found '${typeOwner.javaClass}' instead. Can't implement SAM interface.", e)
                         return
                     }
-                    val samMember = typeOwner.declarations.findSubType<IrDeclaration,IrFunction> { it is IrOverridableMember && it.modality == Modality.ABSTRACT }
+                    val samMember = typeOwner.declarations.findSubType<IrFunction> { it is IrOverridableMember && it.modality == Modality.ABSTRACT }
                     if (samMember == null) {
                         logger.errorElement("Couldn't find SAM member in type '${typeOwner.kotlinFqName.asString()}'. Can't implement SAM interface.", e)
                         return
@@ -4563,7 +4563,7 @@ open class KotlinFileExtractor(
             val superCallId = tw.getFreshIdLabel<DbSuperconstructorinvocationstmt>()
             tw.writeStmts_superconstructorinvocationstmt(superCallId, constructorBlockId, 0, ids.constructor)
 
-            val baseConstructor = baseClass.owner.declarations.findSubType<IrDeclaration,IrFunction> { it.symbol is IrConstructorSymbol }
+            val baseConstructor = baseClass.owner.declarations.findSubType<IrFunction> { it.symbol is IrConstructorSymbol }
             val baseConstructorId = useFunction<DbConstructor>(baseConstructor as IrFunction)
 
             tw.writeHasLocation(superCallId, locId)
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -326,7 +326,7 @@ open class KotlinUsesExtractor(
         if (replacementClass === parentClass)
             return f
         return globalExtensionState.syntheticToRealFunctionMap.getOrPut(f) {
-            val result = replacementClass.declarations.findSubType<IrDeclaration,IrSimpleFunction> { replacementDecl ->
+            val result = replacementClass.declarations.findSubType<IrSimpleFunction> { replacementDecl ->
                 replacementDecl is IrSimpleFunction && replacementDecl.name == f.name && replacementDecl.valueParameters.size == f.valueParameters.size && replacementDecl.valueParameters.zip(f.valueParameters).all {
                     erase(it.first.type) == erase(it.second.type)
                 }
@@ -351,7 +351,7 @@ open class KotlinUsesExtractor(
         if (replacementClass === parentClass)
             return f
         return globalExtensionState.syntheticToRealFieldMap.getOrPut(f) {
-            val result = replacementClass.declarations.findSubType<IrDeclaration,IrField> { replacementDecl ->
+            val result = replacementClass.declarations.findSubType<IrField> { replacementDecl ->
                 replacementDecl.name == f.name
             }
             if (result == null) {
@@ -1097,7 +1097,7 @@ open class KotlinUsesExtractor(
             return f.returnType
         }
 
-        val otherKeySet = parentClass.declarations.findSubType<IrDeclaration,IrFunction> { it.name.asString() == "keySet" && it.valueParameters.size == 1 }
+        val otherKeySet = parentClass.declarations.findSubType<IrFunction> { it.name.asString() == "keySet" && it.valueParameters.size == 1 }
             ?: return f.returnType
 
         return otherKeySet.returnType.codeQlWithHasQuestionMark(false)
@@ -1177,7 +1177,7 @@ open class KotlinUsesExtractor(
                 getJavaEquivalentClass(parentClass)?.let { javaClass ->
                     if (javaClass != parentClass)
                         // Look for an exact type match...
-                        javaClass.declarations.findSubType<IrDeclaration,IrFunction> { decl ->
+                        javaClass.declarations.findSubType<IrFunction> { decl ->
                             decl.name == f.name &&
                             decl.valueParameters.size == f.valueParameters.size &&
                             // Note matching by classifier not the whole type so that generic arguments are allowed to differ,
@@ -1193,7 +1193,7 @@ open class KotlinUsesExtractor(
                         } ?:
                         // Or check property accessors:
                         if (f.isAccessor) {
-                            val prop = javaClass.declarations.findSubType<IrDeclaration,IrProperty> { decl ->
+                            val prop = javaClass.declarations.findSubType<IrProperty> { decl ->
                                 decl.name == (f.propertyIfAccessor as IrProperty).name
                             }
                             if (prop?.getter?.name == f.name)
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/Iterable.kt b/java/kotlin-extractor/src/main/kotlin/utils/Iterable.kt
@@ -1,11 +1,13 @@
 package com.github.codeql
 
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+
 /**
- * This behaves the same as Iterable<T>.find, but requires
+ * This behaves the same as Iterable<IrDeclaration>.find, but requires
  * that the value found is of the subtype S, and it casts
  * the result for you appropriately.
  */
-inline fun <T,reified S: T> Iterable<T>.findSubType(
+inline fun <reified S: IrDeclaration> Iterable<IrDeclaration>.findSubType(
     predicate: (S) -> Boolean
 ): S? {
     return this.find { it is S && predicate(it) } as S?

Original file line number	Diff line number	Diff line change
`@@ -1568,7 +1568,7 @@ open class KotlinFileExtractor(`
`1568`	`1568`	`}`
`1569`	`1569`	`}`
`1570`	`1570`
`1571`		`- private fun findFunction(cls: IrClass, name: String): IrFunction? = cls.declarations.findSubType<IrDeclaration,IrFunction> { it.name.asString() == name }`
	`1571`	`+ private fun findFunction(cls: IrClass, name: String): IrFunction? = cls.declarations.findSubType<IrFunction> { it.name.asString() == name }`
`1572`	`1572`
`1573`	`1573`	`val jvmIntrinsicsClass by lazy {`
`1574`	`1574`	`val result = pluginContext.referenceClass(FqName("kotlin.jvm.internal.Intrinsics"))?.owner`
`@@ -1625,7 +1625,7 @@ open class KotlinFileExtractor(`
`1625`	`1625`	`}`
`1626`	`1626`
`1627`	`1627`	`val stringValueOfObjectMethod by lazy {`
`1628`		`- val result = javaLangString?.declarations?.findSubType<IrDeclaration,IrFunction> {`
	`1628`	`+ val result = javaLangString?.declarations?.findSubType<IrFunction> {`
`1629`	`1629`	`it.name.asString() == "valueOf" &&`
`1630`	`1630`	`it.valueParameters.size == 1 &&`
`1631`	`1631`	`it.valueParameters[0].type == pluginContext.irBuiltIns.anyNType`
`@@ -1637,7 +1637,7 @@ open class KotlinFileExtractor(`
`1637`	`1637`	`}`
`1638`	`1638`
`1639`	`1639`	`val objectCloneMethod by lazy {`
`1640`		`- val result = javaLangObject?.declarations?.findSubType<IrDeclaration,IrFunction> {`
	`1640`	`+ val result = javaLangObject?.declarations?.findSubType<IrFunction> {`
`1641`	`1641`	`it.name.asString() == "clone"`
`1642`	`1642`	`}`
`1643`	`1643`	`if (result == null) {`
`@@ -1653,7 +1653,7 @@ open class KotlinFileExtractor(`
`1653`	`1653`	`}`
`1654`	`1654`
`1655`	`1655`	`val kotlinNoWhenBranchMatchedConstructor by lazy {`
`1656`		`- val result = kotlinNoWhenBranchMatchedExn?.declarations?.findSubType<IrDeclaration,IrConstructor> {`
	`1656`	`+ val result = kotlinNoWhenBranchMatchedExn?.declarations?.findSubType<IrConstructor> {`
`1657`	`1657`	`it.valueParameters.isEmpty()`
`1658`	`1658`	`}`
`1659`	`1659`	`if (result == null) {`
`@@ -1775,7 +1775,7 @@ open class KotlinFileExtractor(`
`1775`	`1775`	`return`
`1776`	`1776`	`}`
`1777`	`1777`
`1778`		`- val func = ((c.getTypeArgument(0) as? IrSimpleType)?.classifier?.owner as? IrClass)?.declarations?.findSubType<IrDeclaration,IrFunction> { it.name.asString() == fnName }`
	`1778`	`+ val func = ((c.getTypeArgument(0) as? IrSimpleType)?.classifier?.owner as? IrClass)?.declarations?.findSubType<IrFunction> { it.name.asString() == fnName }`
`1779`	`1779`	`if (func == null) {`
`1780`	`1780`	`logger.errorElement("Couldn't find function $fnName on enum type", c)`
`1781`	`1781`	`return`
`@@ -2225,7 +2225,7 @@ open class KotlinFileExtractor(`
`2225`	`2225`	`logger.errorElement("Argument to dataClassArrayMemberToString not a class", c)`
`2226`	`2226`	`return`
`2227`	`2227`	`}`
`2228`		`- val realCallee = javaUtilArrays?.declarations?.findSubType<IrDeclaration,IrFunction> { decl ->`
	`2228`	`+ val realCallee = javaUtilArrays?.declarations?.findSubType<IrFunction> { decl ->`
`2229`	`2229`	`decl.name.asString() == "toString" && decl.valueParameters.size == 1 &&`
`2230`	`2230`	`decl.valueParameters[0].type.classOrNull?.let { it == realArrayClass } == true`
`2231`	`2231`	`}`
`@@ -2252,7 +2252,7 @@ open class KotlinFileExtractor(`
`2252`	`2252`	`logger.errorElement("Argument to dataClassArrayMemberHashCode not a class", c)`
`2253`	`2253`	`return`
`2254`	`2254`	`}`
`2255`		`- val realCallee = javaUtilArrays?.declarations?.findSubType<IrDeclaration,IrFunction> { decl ->`
	`2255`	`+ val realCallee = javaUtilArrays?.declarations?.findSubType<IrFunction> { decl ->`
`2256`	`2256`	`decl.name.asString() == "hashCode" && decl.valueParameters.size == 1 &&`
`2257`	`2257`	`decl.valueParameters[0].type.classOrNull?.let { it == realArrayClass } == true`
`2258`	`2258`	`}`
`@@ -4363,7 +4363,7 @@ open class KotlinFileExtractor(`
`4363`	`4363`	`return`
`4364`	`4364`	`}`
`4365`	`4365`
`4366`		`- val invokeMethod = functionType.classOrNull?.owner?.declarations?.findSubType<IrDeclaration,IrFunction> { it.name.asString() == OperatorNameConventions.INVOKE.asString()}`
	`4366`	`+ val invokeMethod = functionType.classOrNull?.owner?.declarations?.findSubType<IrFunction> { it.name.asString() == OperatorNameConventions.INVOKE.asString()}`
`4367`	`4367`	`if (invokeMethod == null) {`
`4368`	`4368`	logger.errorElement("Couldn't find `invoke` method on functional interface.", e)
`4369`	`4369`	`return`
`@@ -4374,7 +4374,7 @@ open class KotlinFileExtractor(`
`4374`	`4374`	`logger.errorElement("Expected to find SAM conversion to IrClass. Found '${typeOwner.javaClass}' instead. Can't implement SAM interface.", e)`
`4375`	`4375`	`return`
`4376`	`4376`	`}`
`4377`		`- val samMember = typeOwner.declarations.findSubType<IrDeclaration,IrFunction> { it is IrOverridableMember && it.modality == Modality.ABSTRACT }`
	`4377`	`+ val samMember = typeOwner.declarations.findSubType<IrFunction> { it is IrOverridableMember && it.modality == Modality.ABSTRACT }`
`4378`	`4378`	`if (samMember == null) {`
`4379`	`4379`	`logger.errorElement("Couldn't find SAM member in type '${typeOwner.kotlinFqName.asString()}'. Can't implement SAM interface.", e)`
`4380`	`4380`	`return`
`@@ -4563,7 +4563,7 @@ open class KotlinFileExtractor(`
`4563`	`4563`	`val superCallId = tw.getFreshIdLabel<DbSuperconstructorinvocationstmt>()`
`4564`	`4564`	`tw.writeStmts_superconstructorinvocationstmt(superCallId, constructorBlockId, 0, ids.constructor)`
`4565`	`4565`
`4566`		`- val baseConstructor = baseClass.owner.declarations.findSubType<IrDeclaration,IrFunction> { it.symbol is IrConstructorSymbol }`
	`4566`	`+ val baseConstructor = baseClass.owner.declarations.findSubType<IrFunction> { it.symbol is IrConstructorSymbol }`
`4567`	`4567`	`val baseConstructorId = useFunction<DbConstructor>(baseConstructor as IrFunction)`
`4568`	`4568`
`4569`	`4569`	`tw.writeHasLocation(superCallId, locId)`