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

Always extract ValueEQ/NEExpr for Kotlin ==/!=

Browse Source 
I introduce AnyEqualsExpr for either reference or value equality and AnyEqualityTest for the same concept including not-equals operators, and use them wherever the written QL clearly doesn't care about the difference between reference and value comparison, typically because it is concerned with testing against null or against a primitive constant.
This commit is contained in:
Chris Smowton
2022-02-04 16:42:13 +00:00
committed by Ian Lynagh
parent a120fab9f7
commit f95effcf82
27 changed files with 118 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1278,15 +1278,9 @@ open class KotlinFileExtractor(
}
// != gets desugared into not and ==. Here we resugar it.
c.origin == IrStatementOrigin.EXCLEQ && isFunction("kotlin", "Boolean", "not") && c.valueArgumentsCount == 0 && dr != null && dr is IrCall && isBuiltinCallInternal(dr, "EQEQ") -> {
var id: Label<out DbExpr>
var id = tw.getFreshIdLabel<DbValueneexpr>()
val type = useType(c.type)
if (isShallowEqualityTest(dr)) {
id = tw.getFreshIdLabel<DbNeexpr>()
tw.writeExprs_neexpr(id, type.javaResult.id, parent, idx)
} else {
id = tw.getFreshIdLabel<DbValueneexpr>()
tw.writeExprs_valueneexpr(id, type.javaResult.id, parent, idx)
}
tw.writeExprs_valueneexpr(id, type.javaResult.id, parent, idx)
tw.writeExprsKotlinType(id, type.kotlinResult.id)
binOp(id, dr, callable, enclosingStmt)
}
@@ -1351,15 +1345,9 @@ open class KotlinFileExtractor(
if(c.origin != IrStatementOrigin.EQEQ) {
logger.errorElement("Unexpected origin for EQEQ: ${c.origin}", c)
}
var id: Label<out DbExpr>
var id = tw.getFreshIdLabel<DbValueeqexpr>()
val type = useType(c.type)
if (isShallowEqualityTest(c)) {
id = tw.getFreshIdLabel<DbEqexpr>()
tw.writeExprs_eqexpr(id, type.javaResult.id, parent, idx)
} else {
id = tw.getFreshIdLabel<DbValueeqexpr>()
tw.writeExprs_valueeqexpr(id, type.javaResult.id, parent, idx)
}
tw.writeExprs_valueeqexpr(id, type.javaResult.id, parent, idx)
tw.writeExprsKotlinType(id, type.kotlinResult.id)
binOp(id, c, callable, enclosingStmt)
}