hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-20 18:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix extraction of data classes with array members

Browse Source 
These use compiler-internal intrinsics at the IR layer, which are later lowered to java.util.Arrays calls. This performs that lowering in the same manner.
This commit is contained in:
Chris Smowton
2022-03-18 18:35:01 +00:00
committed by Ian Lynagh
parent ae2ca183cc
commit aab271d81e
6 changed files with 213 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -1256,6 +1256,12 @@ open class KotlinFileExtractor(
result
}
val javaUtilArrays by lazy {
val result = pluginContext.referenceClass(FqName("java.util.Arrays"))?.owner
result?.let { extractExternalClassLater(it) }
result
}
fun isFunction(target: IrFunction, pkgName: String, classNameLogged: String, classNamePredicate: (String) -> Boolean, fName: String, hasQuestionMark: Boolean? = false): Boolean {
val verbose = false
fun verboseln(s: String) { if(verbose) println(s) }
@@ -1774,6 +1780,60 @@ open class KotlinFileExtractor(
extractTypeAccessRecursive(c.getTypeArgument(1)!!, locId, id, 0, callable, enclosingStmt)
extractExpressionExpr(c.getValueArgument(0)!!, callable, id, 1, enclosingStmt)
}
isBuiltinCallInternal(c, "dataClassArrayMemberToString") -> {
val arrayArg = c.getValueArgument(0)
val realArrayClass = arrayArg?.type?.classOrNull
if (realArrayClass == null) {
logger.errorElement("Argument to dataClassArrayMemberToString not a class", c)
return
}
val realCallee = javaUtilArrays?.declarations?.find { decl ->
decl is IrFunction && decl.name.asString() == "toString" && decl.valueParameters.size == 1 &&
decl.valueParameters[0].type.classOrNull?.let { it == realArrayClass } == true
} as IrFunction?
if (realCallee == null) {
logger.errorElement("Couldn't find a java.lang.Arrays.toString method matching class ${realArrayClass.owner.name}", c)
} else {
extractRawMethodAccess(
realCallee,
c,
callable,
parent,
idx,
enclosingStmt,
listOf(arrayArg),
null,
null
)
}
}
isBuiltinCallInternal(c, "dataClassArrayMemberHashCode") -> {
val arrayArg = c.getValueArgument(0)
val realArrayClass = arrayArg?.type?.classOrNull
if (realArrayClass == null) {
logger.errorElement("Argument to dataClassArrayMemberHashCode not a class", c)
return
}
val realCallee = javaUtilArrays?.declarations?.find { decl ->
decl is IrFunction && decl.name.asString() == "hashCode" && decl.valueParameters.size == 1 &&
decl.valueParameters[0].type.classOrNull?.let { it == realArrayClass } == true
} as IrFunction?
if (realCallee == null) {
logger.errorElement("Couldn't find a java.lang.Arrays.hashCode method matching class ${realArrayClass.owner.name}", c)
} else {
extractRawMethodAccess(
realCallee,
c,
callable,
parent,
idx,
enclosingStmt,
listOf(arrayArg),
null,
null
)
}
}
else -> {
extractMethodAccess(target, true, true)
}