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

Kotlin: Use findSubType in KotlinUsesExtractor too

Browse Source
This commit is contained in:
Ian Lynagh
2022-08-24 12:16:16 +01:00
parent 28d95f4d99
commit 4cd90a15d0
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -326,11 +326,11 @@ open class KotlinUsesExtractor(
if (replacementClass === parentClass)
return f
return globalExtensionState.syntheticToRealFunctionMap.getOrPut(f) {
val result = replacementClass.declarations.find { replacementDecl ->
val result = replacementClass.declarations.findSubType<IrDeclaration,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)
}
} as IrFunction?
}
if (result == null) {
logger.warn("Failed to replace synthetic class function ${f.name}")
} else {
@@ -351,9 +351,9 @@ open class KotlinUsesExtractor(
if (replacementClass === parentClass)
return f
return globalExtensionState.syntheticToRealFieldMap.getOrPut(f) {
val result = replacementClass.declarations.find { replacementDecl ->
replacementDecl is IrField && replacementDecl.name == f.name
} as IrField?
val result = replacementClass.declarations.findSubType<IrDeclaration,IrField> { replacementDecl ->
replacementDecl.name == f.name
}
if (result == null) {
logger.warn("Failed to replace synthetic class field ${f.name}")
} else {
@@ -1097,7 +1097,7 @@ open class KotlinUsesExtractor(
return f.returnType
}
val otherKeySet = parentClass.declarations.filterIsInstance<IrFunction>().find { it.name.asString() == "keySet" && it.valueParameters.size == 1 }
val otherKeySet = parentClass.declarations.findSubType<IrDeclaration,IrFunction> { it.name.asString() == "keySet" && it.valueParameters.size == 1 }
?: return f.returnType
return otherKeySet.returnType.codeQlWithHasQuestionMark(false)
@@ -1177,8 +1177,7 @@ open class KotlinUsesExtractor(
getJavaEquivalentClass(parentClass)?.let { javaClass ->
if (javaClass != parentClass)
// Look for an exact type match...
javaClass.declarations.find { decl ->
decl is IrFunction &&
javaClass.declarations.findSubType<IrDeclaration,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,
@@ -1194,7 +1193,7 @@ open class KotlinUsesExtractor(
} ?:
// Or check property accessors:
if (f.isAccessor) {
val prop = javaClass.declarations.filterIsInstance<IrProperty>().find { decl ->
val prop = javaClass.declarations.findSubType<IrDeclaration,IrProperty> { decl ->
decl.name == (f.propertyIfAccessor as IrProperty).name
}
if (prop?.getter?.name == f.name)