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

Kotlin: useDeclarationParent: Don't use fakeLabel

Browse Source
This commit is contained in:
Ian Lynagh
2022-03-29 17:11:30 +01:00
parent 5c8e0ff49b
commit 37cf36bc33
2 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,23 +104,35 @@ open class KotlinFileExtractor(
}
}
is IrFunction -> {
val parentId = useDeclarationParent(declaration.parent, false).cast<DbReftype>()
extractFunction(declaration, parentId, true, null, listOf())
val parentId = useDeclarationParent(declaration.parent, false)?.cast<DbReftype>()
if (parentId != null) {
extractFunction(declaration, parentId, true, null, listOf())
}
Unit
}
is IrAnonymousInitializer -> {
// Leaving this intentionally empty. init blocks are extracted during class extraction.
}
is IrProperty -> {
val parentId = useDeclarationParent(declaration.parent, false).cast<DbReftype>()
extractProperty(declaration, parentId, true, null, listOf())
val parentId = useDeclarationParent(declaration.parent, false)?.cast<DbReftype>()
if (parentId != null) {
extractProperty(declaration, parentId, true, null, listOf())
}
Unit
}
is IrEnumEntry -> {
val parentId = useDeclarationParent(declaration.parent, false).cast<DbReftype>()
extractEnumEntry(declaration, parentId)
val parentId = useDeclarationParent(declaration.parent, false)?.cast<DbReftype>()
if (parentId != null) {
extractEnumEntry(declaration, parentId)
}
Unit
}
is IrField -> {
val parentId = useDeclarationParent(declaration.parent, false).cast<DbReftype>()
extractField(declaration, parentId)
val parentId = useDeclarationParent(declaration.parent, false)?.cast<DbReftype>()
if (parentId != null) {
extractField(declaration, parentId)
}
Unit
}
is IrTypeAlias -> extractTypeAlias(declaration)
else -> logger.errorElement("Unrecognised IrDeclaration: " + declaration.javaClass, declaration)

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

@@ -640,7 +640,7 @@ open class KotlinUsesExtractor(
canBeTopLevel: Boolean,
classTypeArguments: List<IrTypeArgument>? = null,
inReceiverContext: Boolean = false):
Label<out DbElement> =
Label<out DbElement>? =
when(dp) {
is IrFile ->
if(canBeTopLevel) {
@@ -653,11 +653,11 @@ open class KotlinUsesExtractor(
is IrExternalPackageFragment -> {
// TODO
logger.error("Unhandled IrExternalPackageFragment")
fakeLabel()
null
}
else -> {
logger.error("Unrecognised IrDeclarationParent: " + dp.javaClass)
fakeLabel()
null
}
}
@@ -1105,14 +1105,26 @@ open class KotlinUsesExtractor(
fun useField(f: IrField): Label<out DbField> =
tw.getLabelFor<DbField>(getFieldLabel(f)).also { extractFieldLaterIfExternalFileMember(f) }
fun getPropertyLabel(p: IrProperty) =
getPropertyLabel(p, useDeclarationParent(p.parent, false))
fun getPropertyLabel(p: IrProperty): String? {
val parentId = useDeclarationParent(p.parent, false)
if (parentId == null) {
return null
} else {
return getPropertyLabel(p, parentId)
}
}
fun getPropertyLabel(p: IrProperty, parentId: Label<out DbElement>) =
"@\"property;{$parentId};${p.name.asString()}\""
fun useProperty(p: IrProperty): Label<out DbKt_property> =
tw.getLabelFor<DbKt_property>(getPropertyLabel(p)).also { extractPropertyLaterIfExternalFileMember(p) }
fun useProperty(p: IrProperty): Label<out DbKt_property>? {
val label = getPropertyLabel(p)
if (label == null) {
return null
} else {
return tw.getLabelFor<DbKt_property>(label).also { extractPropertyLaterIfExternalFileMember(p) }
}
}
fun useProperty(p: IrProperty, parentId: Label<out DbElement>): Label<out DbKt_property> =
tw.getLabelFor<DbKt_property>(getPropertyLabel(p, parentId)).also { extractPropertyLaterIfExternalFileMember(p) }