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

Merge pull request #10291 from tamasvajk/kotlin-fix-array-set

Browse Source 
Kotlin: Fix array `set` operator extraction
This commit is contained in:
Tamás Vajk
2022-09-06 09:01:05 +02:00
committed by GitHub
parent 604af4f7b3 6f7f760682
commit 5f841f71db
3 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2208,7 +2208,7 @@ open class KotlinFileExtractor(
tw.writeExprsKotlinType(id, type.kotlinResult.id)
binopDisp(id)
}
isFunction(target, "kotlin", "(some array type)", { isArrayType(it) }, "set") && c.origin == IrStatementOrigin.EQ -> {
isFunction(target, "kotlin", "(some array type)", { isArrayType(it) }, "set") && c.origin == IrStatementOrigin.EQ && c.dispatchReceiver != null -> {
val array = c.dispatchReceiver
val arrayIdx = c.getValueArgument(0)
val assignedValue = c.getValueArgument(1)

80
java/ql/test/kotlin/library-tests/operator-overloads/PrintAst.expected
View File

@@ -30,30 +30,74 @@ test.kt:
# 4| -1: [VarAccess] mt
# 4| 0: [IntegerLiteral] 1
# 4| 1: [IntegerLiteral] 2
# 7| 2: [ExtensionMethod] get
# 7| 3: [TypeAccess] String
# 6| 3: [ExprStmt] <Expr>;
# 6| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 6| 0: [TypeAccess] Unit
# 6| 1: [MethodAccess] set(...)
# 6| -1: [TypeAccess] TestKt
# 6| 0: [VarAccess] arr
# 6| 1: [IntegerLiteral] 1
# 6| 2: [IntegerLiteral] 2
# 6| 3: [IntegerLiteral] 3
# 7| 4: [ExprStmt] <Expr>;
# 7| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 7| 0: [TypeAccess] Unit
# 7| 1: [MethodAccess] set(...)
# 7| -1: [TypeAccess] TestKt
# 7| 0: [VarAccess] arr
# 7| 1: [IntegerLiteral] 1
# 7| 2: [ClassInstanceExpr] new C(...)
# 7| -3: [TypeAccess] C
# 10| 2: [ExtensionMethod] get
# 10| 3: [TypeAccess] String
#-----| 4: (Parameters)
# 7| 0: [Parameter] <this>
# 7| 0: [TypeAccess] byte[]
# 7| 1: [Parameter] i
# 7| 0: [TypeAccess] int
# 7| 2: [Parameter] j
# 7| 0: [TypeAccess] int
# 7| 5: [BlockStmt] { ... }
# 7| 0: [ReturnStmt] return ...
# 7| 0: [StringLiteral]
# 10| 2: [Class] C
# 10| 1: [Constructor] C
# 10| 0: [Parameter] <this>
# 10| 0: [TypeAccess] byte[]
# 10| 1: [Parameter] i
# 10| 0: [TypeAccess] int
# 10| 2: [Parameter] j
# 10| 0: [TypeAccess] int
# 10| 5: [BlockStmt] { ... }
# 10| 0: [SuperConstructorInvocationStmt] super(...)
# 10| 1: [BlockStmt] { ... }
# 11| 2: [Method] get
# 10| 0: [ReturnStmt] return ...
# 10| 0: [StringLiteral]
# 11| 3: [ExtensionMethod] set
# 11| 3: [TypeAccess] String
#-----| 4: (Parameters)
# 11| 0: [Parameter] i
# 11| 0: [Parameter] <this>
# 11| 0: [TypeAccess] byte[]
# 11| 1: [Parameter] i
# 11| 0: [TypeAccess] int
# 11| 1: [Parameter] j
# 11| 2: [Parameter] j
# 11| 0: [TypeAccess] int
# 11| 3: [Parameter] k
# 11| 0: [TypeAccess] int
# 11| 5: [BlockStmt] { ... }
# 11| 0: [ReturnStmt] return ...
# 11| 0: [StringLiteral]
# 12| 4: [ExtensionMethod] set
# 12| 3: [TypeAccess] String
#-----| 4: (Parameters)
# 12| 0: [Parameter] <this>
# 12| 0: [TypeAccess] byte[]
# 12| 1: [Parameter] i
# 12| 0: [TypeAccess] int
# 12| 2: [Parameter] c
# 12| 0: [TypeAccess] C
# 12| 5: [BlockStmt] { ... }
# 12| 0: [ReturnStmt] return ...
# 12| 0: [StringLiteral]
# 15| 2: [Class] C
# 15| 1: [Constructor] C
# 15| 5: [BlockStmt] { ... }
# 15| 0: [SuperConstructorInvocationStmt] super(...)
# 15| 1: [BlockStmt] { ... }
# 16| 2: [Method] get
# 16| 3: [TypeAccess] String
#-----| 4: (Parameters)
# 16| 0: [Parameter] i
# 16| 0: [TypeAccess] int
# 16| 1: [Parameter] j
# 16| 0: [TypeAccess] int
# 16| 5: [BlockStmt] { ... }
# 16| 0: [ReturnStmt] return ...
# 16| 0: [StringLiteral]

5
java/ql/test/kotlin/library-tests/operator-overloads/test.kt
View File

@@ -2,9 +2,14 @@ fun fn(arr: ByteArray, mt: C) {
arr[1]
arr[1, 2]
mt[1, 2]
arr[1, 2] = 3
arr[1] = C()
}
public operator fun ByteArray.get(i: Int, j: Int) = ""
public operator fun ByteArray.set(i: Int, j: Int, k: Int) = ""
public operator fun ByteArray.set(i: Int, c: C) = ""
public class C {