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

Kotlin: Follow removal of sourceid column of the fields relation

Browse Source
This commit is contained in:
Ian Lynagh
2024-09-18 11:23:54 +01:00
parent 300864a38b
commit 0be52f9660
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1020,7 +1020,7 @@ open class KotlinFileExtractor(
// here.
val instance = useObjectClassInstance(c)
val type = useSimpleTypeClass(c, emptyList(), false)
tw.writeFields(instance.id, instance.name, type.javaResult.id, id, instance.id)
tw.writeFields(instance.id, instance.name, type.javaResult.id, id)
tw.writeFieldsKotlinType(instance.id, type.kotlinResult.id)
tw.writeHasLocation(instance.id, locId)
addModifiers(instance.id, "public", "static", "final")
@@ -1237,8 +1237,7 @@ open class KotlinFileExtractor(
instance.id,
instance.name,
type.javaResult.id,
parentId,
instance.id
parentId
)
tw.writeFieldsKotlinType(instance.id, type.kotlinResult.id)
tw.writeHasLocation(instance.id, innerLocId)
@@ -2600,7 +2599,7 @@ open class KotlinFileExtractor(
isStatic: Boolean
): Label<out DbField> {
val t = useType(type)
tw.writeFields(id, name, t.javaResult.id, parentId, id)
tw.writeFields(id, name, t.javaResult.id, parentId)
tw.writeFieldsKotlinType(id, t.kotlinResult.id)
tw.writeHasLocation(id, locId)
@@ -2757,7 +2756,7 @@ open class KotlinFileExtractor(
DeclarationStackAdjuster(ee).use {
val id = useEnumEntry(ee)
val type = getEnumEntryType(ee) ?: return
tw.writeFields(id, ee.name.asString(), type.javaResult.id, parentId, id)
tw.writeFields(id, ee.name.asString(), type.javaResult.id, parentId)
tw.writeFieldsKotlinType(id, type.kotlinResult.id)
val locId = tw.getLocation(ee)
tw.writeHasLocation(id, locId)

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

@@ -779,7 +779,7 @@ open class KotlinUsesExtractor(
// array.length
val length = tw.getLabelFor<DbField>("@\"field;{$it};length\"")
val intTypeIds = useType(pluginContext.irBuiltIns.intType)
tw.writeFields(length, "length", intTypeIds.javaResult.id, it, length)
tw.writeFields(length, "length", intTypeIds.javaResult.id, it)
tw.writeFieldsKotlinType(length, intTypeIds.kotlinResult.id)
addModifiers(length, "public", "final")