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

Extract local class declarations

Browse Source
This commit is contained in:
Tamas Vajk
2021-12-21 11:12:44 +01:00
committed by Ian Lynagh
parent 1e64887903
commit e0bf7d8246
13 changed files with 558 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,13 +201,13 @@ open class KotlinFileExtractor(
}
}
private fun extracLocalTypeDeclStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
private fun extractLocalTypeDeclStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
@Suppress("UNCHECKED_CAST")
val id = extractClassSource(c) as Label<out DbClass>
extracLocalTypeDeclStmt(id, c, callable, parent, idx)
extractLocalTypeDeclStmt(id, c, callable, parent, idx)
}
private fun extracLocalTypeDeclStmt(id: Label<out DbClass>, locElement: IrElement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
private fun extractLocalTypeDeclStmt(id: Label<out DbClass>, locElement: IrElement, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
val stmtId = tw.getFreshIdLabel<DbLocaltypedeclstmt>()
tw.writeStmts_localtypedeclstmt(stmtId, parent, idx, callable)
tw.writeIsLocalClassOrInterface(id, stmtId)
@@ -656,16 +656,12 @@ open class KotlinFileExtractor(
extractVariable(s, callable, parent, idx)
}
is IrClass -> {
if (s.isAnonymousObject) {
extracLocalTypeDeclStmt(s, callable, parent, idx)
} else {
logger.warnElement(Severity.ErrorSevere, "Found non anonymous IrClass as IrStatement: " + s.javaClass, s)
}
extractLocalTypeDeclStmt(s, callable, parent, idx)
}
is IrFunction -> {
if (s.isLocalFunction()) {
val classId = extractGeneratedClass(s, listOf(pluginContext.irBuiltIns.anyType))
extracLocalTypeDeclStmt(classId, s, callable, parent, idx)
extractLocalTypeDeclStmt(classId, s, callable, parent, idx)
} else {
logger.warnElement(Severity.ErrorSevere, "Expected to find local function", s)
}

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

@@ -658,13 +658,18 @@ class X {
private fun getUnquotedClassLabel(c: IrClass, typeArgs: List<IrTypeArgument>?): ClassLabelResults {
val pkg = c.packageFqName?.asString() ?: ""
val cls = c.name.asString()
val parent = c.parent
val label = if (parent is IrClass) {
// todo: fix this. Ugly string concat to handle nested class IDs.
// todo: Can the containing class have type arguments?
"${getUnquotedClassLabel(parent, listOf()).classLabel}\$$cls"
} else {
if (pkg.isEmpty()) cls else "$pkg.$cls"
val label = when (val parent = c.parent) {
is IrClass -> {
// todo: fix this. Ugly string concat to handle nested class IDs.
// todo: Can the containing class have type arguments?
"${getUnquotedClassLabel(parent, listOf()).classLabel}\$$cls"
}
is IrFunction -> {
"{${useFunction<DbMethod>(parent)}}.$cls"
}
else -> {
if (pkg.isEmpty()) cls else "$pkg.$cls"
}
}
val typeArgLabels = typeArgs?.map { getTypeArgumentLabel(it) }