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

Explicitly check if a when expression is in the expected &&/|| form

Browse Source
This commit is contained in:
Tamas Vajk
2022-04-20 15:02:58 +02:00
committed by Ian Lynagh
parent 3af8273620
commit 465a85bb8c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2635,8 +2635,15 @@ open class KotlinFileExtractor(
}
}
is IrWhen -> {
if (e.origin == IrStatementOrigin.ANDAND ||
e.origin == IrStatementOrigin.OROR) {
val isAndAnd = e.origin == IrStatementOrigin.ANDAND
val isOrOr = e.origin == IrStatementOrigin.OROR
if ((isAndAnd || isOrOr) &&
e.branches.size == 2 &&
e.branches[1].condition is IrConst<*> &&
(e.branches[1].condition as IrConst<*>).value == true &&
e.branches[if (e.origin == IrStatementOrigin.ANDAND) 1 else 0].result is IrConst<*> &&
(e.branches[if (e.origin == IrStatementOrigin.ANDAND) 1 else 0].result as IrConst<*>).value == isOrOr) {
// resugar binary logical operators:
@@ -2660,14 +2667,9 @@ open class KotlinFileExtractor(
tw.writeCallableEnclosingExpr(id, callable)
tw.writeStatementEnclosingExpr(id, exprParent.enclosingStmt)
if (e.branches.size != 2) {
logger.errorElement("Expected to find 2 when branches for ${e.origin}, found ${e.branches.size}", e)
return
}
extractExpressionExpr(e.branches[0].condition, callable, id, 0, exprParent.enclosingStmt)
var rhsIdx = if (e.origin == IrStatementOrigin.ANDAND) 0 else 1
var rhsIdx = if (e.origin == IrStatementOrigin.ANDAND) 0 else 1
extractExpressionExpr(e.branches[rhsIdx].result, callable, id, 1, exprParent.enclosingStmt)
return