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

Kotlin: Add support for objects

Browse Source
This commit is contained in:
Ian Lynagh
2021-11-07 22:55:29 +00:00
parent 35a15d7eb4
commit ceb1e57ddd
8 changed files with 85 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -873,18 +873,43 @@ open class KotlinFileExtractor(
}
}
val locId = tw.getLocation(c)
tw.writeHasLocation(id, locId)
c.typeParameters.map { extractTypeParameter(it) }
c.declarations.map { extractDeclaration(it, id) }
extractObjectInitializerFunction(c, id)
val locId = tw.getLocation(c)
tw.writeHasLocation(id, locId)
if(c.isObject) {
// For `object MyObject { ... }`, the .class has an
// automatically-generated `public static final MyObject INSTANCE`
// field that may be referenced from Java code, and is used in our
// IrGetObjectValue support. We therefore need to fabricate it
// here.
val instance = useObjectClassInstance(c)
val type = useSimpleTypeClass(c, emptyList(), false)
tw.writeFields(instance.id, instance.name, type.javaResult.id, type.kotlinResult.id, id, instance.id)
tw.writeHasLocation(instance.id, locId)
@Suppress("UNCHECKED_CAST")
tw.writeClass_object(id as Label<DbClass>, instance.id)
}
extractClassCommon(c, id)
return id
}
data class ObjectClassInstance(val id: Label<DbField>, val name: String)
fun useObjectClassInstance(c: IrClass): ObjectClassInstance {
if(!c.isObject) {
logger.warn(Severity.ErrorSevere, "Using instance for non-object class")
}
val classId = useClassSource(c)
val instanceName = "INSTANCE"
val instanceLabel = "@\"field;{$classId};$instanceName\""
val instanceId: Label<DbField> = tw.getLabelFor(instanceLabel)
return ObjectClassInstance(instanceId, instanceName)
}
private fun isQualifiedThis(vp: IrValueParameter): Boolean {
return isQualifiedThisFunction(vp) ||
isQualifiedThisClass(vp)
@@ -1623,6 +1648,22 @@ open class KotlinFileExtractor(
val exprParent = parent.expr(e, callable)
extractTypeOperatorCall(e, callable, exprParent.parent, exprParent.idx)
}
is IrGetObjectValue -> {
// For `object MyObject { ... }`, the .class has an
// automatically-generated `public static final MyObject INSTANCE`
// field that we are accessing here.
val exprParent = parent.expr(e, callable)
val c: IrClass = e.symbol.owner
val instance = useObjectClassInstance(c)
val id = tw.getFreshIdLabel<DbVaraccess>()
val type = useType(e.type)
val locId = tw.getLocation(e)
tw.writeExprs_varaccess(id, type.javaResult.id, type.kotlinResult.id, exprParent.parent, exprParent.idx)
tw.writeHasLocation(id, locId)
tw.writeVariableBinding(id, instance.id)
}
else -> {
logger.warnElement(Severity.ErrorSevere, "Unrecognised IrExpression: " + e.javaClass, e)
}