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

Kotlin: Fix field lookup in Android synthetic classes

Browse Source
This commit is contained in:
Tamas Vajk
2022-09-28 15:23:34 +02:00
parent d3c3f3bed9
commit 375698f975
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,9 +366,8 @@ open class KotlinUsesExtractor(
if (replacementClass === parentClass) if (replacementClass === parentClass)
return f return f
return globalExtensionState.syntheticToRealFieldMap.getOrPut(f) { return globalExtensionState.syntheticToRealFieldMap.getOrPut(f) {
val result = replacementClass.declarations.findSubType<IrField> { replacementDecl -> val result = replacementClass.declarations.findSubType<IrField> { replacementDecl -> replacementDecl.name == f.name }
replacementDecl.name == f.name ?: replacementClass.declarations.findSubType<IrProperty> { it.backingField?.name == f.name}?.backingField
}
if (result == null) { if (result == null) {
logger.warn("Failed to replace synthetic class field ${f.name}") logger.warn("Failed to replace synthetic class field ${f.name}")
} else { } else {