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

Always use the nullable type for arrays

Browse Source
This commit is contained in:
Chris Smowton
2021-11-10 15:24:32 +00:00
committed by Ian Lynagh
parent 0ba4753b8f
commit 1d95431a7a
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -597,8 +597,20 @@ class X {
val componentTypeLabel = useType(componentType)
val elementTypeLabel = useType(elementType)
fun kotlinLabelOfJavaType(type: IrType, typeLabel: Label<out DbKt_type>) =
if (type.isPrimitiveType())
// Java lowering distinguishes nullable and non-nullable, so keep the existing label
typeLabel
else
// Java lowering always concerns the nullable type, so get the nullable equivalent
useType(type.makeNullable()).kotlinResult.id
val kotlinComponentTypeLabel = kotlinLabelOfJavaType(componentType, componentTypeLabel.kotlinResult.id)
val kotlinElementTypeLabel = kotlinLabelOfJavaType(elementType, elementTypeLabel.kotlinResult.id)
val id = tw.getLabelFor<DbArray>("@\"array;$dimensions;{${elementTypeLabel.javaResult.id}}\"") {
tw.writeArrays(it, shortName(s), elementTypeLabel.javaResult.id, elementTypeLabel.kotlinResult.id, 1, componentTypeLabel.javaResult.id, componentTypeLabel.kotlinResult.id)
tw.writeArrays(it, shortName(s), elementTypeLabel.javaResult.id, kotlinElementTypeLabel, 1, componentTypeLabel.javaResult.id, kotlinComponentTypeLabel)
extractClassCommon(s.classifier.owner as IrClass, it)