Fix ExprStmt and StmtExpr in Boolean context

tamasvajk · igfoo · commit 037d66de15b8 · 2022-05-10T19:51:28.000+01:00
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -286,7 +286,7 @@ private module ControlFlowGraphImpl {
    * That is, contexts where the control-flow edges depend on `value` given that `b` ends
    * with a `booleanCompletion(value, _)`.
    */
-  private predicate inBooleanContext(Expr b) {
+  private predicate inBooleanContext(ControlFlowNode b) {
     exists(LogicExpr logexpr |
       logexpr.(BinaryExpr).getLeftOperand() = b
       or
@@ -316,6 +316,10 @@ private module ControlFlowGraphImpl {
       inBooleanContext(whenexpr) and
       whenexpr.getBranch(_).getAResult() = b
     )
+    or
+    inBooleanContext(b.(ExprStmt).getExpr())
+    or
+    inBooleanContext(b.(StmtExpr).getStmt())
   }
 
   /**
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -41,6 +41,7 @@
 | Test.kt:100:25:110:1 | { ... } | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:107:27:109:5 | { ... } |
+| Test.kt:101:22:101:30 | <Expr>; | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/bbSuccessor.expected
@@ -23,7 +23,6 @@
 | Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | t2 |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:30 | ... -> ... |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:30 | <Expr>; |
-| Test.kt:101:22:101:30 | ... -> ... | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:101:22:101:30 | ... -> ... | Test.kt:105:5:109:5 | <Expr>; |
 | Test.kt:101:22:101:30 | <Expr>; | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:101:22:101:30 | <Expr>; | Test.kt:105:5:109:5 | <Expr>; |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
@@ -188,7 +188,6 @@
 | Test.kt:101:22:101:30 | ... -> ... | WhenBranch | Test.kt:101:22:101:30 | true | BooleanLiteral |
 | Test.kt:101:22:101:30 | <Expr>; | ExprStmt | Test.kt:101:22:101:22 | y | VarAccess |
 | Test.kt:101:22:101:30 | <Expr>; | ExprStmt | Test.kt:101:22:101:30 | false | BooleanLiteral |
-| Test.kt:101:22:101:30 | false | BooleanLiteral | Test.kt:101:33:103:5 | { ... } | BlockStmt |
 | Test.kt:101:22:101:30 | false | BooleanLiteral | Test.kt:105:5:109:5 | <Expr>; | ExprStmt |
 | Test.kt:101:22:101:30 | true | BooleanLiteral | Test.kt:101:22:101:30 | <Expr>; | ExprStmt |
 | Test.kt:101:27:101:30 | null | NullLiteral | Test.kt:101:22:101:30 | ... (value equals) ... | ValueEQExpr |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/strictDominance.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/strictDominance.expected
@@ -543,6 +543,8 @@
 | Test.kt:101:9:101:30 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:101:9:101:30 | ... -> ... | Test.kt:108:9:108:29 | <Expr>; |
 | Test.kt:101:22:101:30 | ... -> ... | Test.kt:101:22:101:30 | <Expr>; |
+| Test.kt:101:22:101:30 | <Expr>; | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:101:22:101:30 | <Expr>; | Test.kt:102:9:102:25 | throw ... |
 | Test.kt:101:33:103:5 | { ... } | Test.kt:102:9:102:25 | throw ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:9:107:5 | ... -> ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/strictPostDominance.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/strictPostDominance.expected
@@ -212,6 +212,10 @@
 | Test.kt:101:9:101:30 | ... -> ... | Test.kt:101:5:103:5 | <Expr>; |
 | Test.kt:101:22:101:30 | <Expr>; | Test.kt:101:22:101:30 | ... -> ... |
 | Test.kt:102:9:102:25 | throw ... | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:101:22:101:30 | ... -> ... |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:101:22:101:30 | <Expr>; |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:101:22:101:30 | ... -> ... |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:101:22:101:30 | <Expr>; |
 | Test.kt:105:9:107:5 | ... -> ... | Test.kt:105:5:109:5 | <Expr>; |
 | Test.kt:106:9:106:29 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:108:9:108:29 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
