Merge pull request #20163 from aschackmull/java/postdom-normal

Java: Assume normal termination in post-dominance.

Author: aschackmull

java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll

@@ -57,7 +57,7 @@ private module Input implements BB::InputSig<Location> {
    * Holds if `node` represents an exit node to be used when calculating
    * post dominance.
    */
-  predicate nodeIsPostDominanceExit(Node node) { node instanceof ControlFlow::ExitNode }
+  predicate nodeIsPostDominanceExit(Node node) { node instanceof ControlFlow::NormalExitNode }
 }
 
 private module BbImpl = BB::Make<Location, Input>;

java/ql/test-kotlin1/library-tests/controlflow/basic/strictPostDominance.expected

@@ -208,6 +208,12 @@
 | Test.kt:101:5:103:5 | ... -> ... | Test.kt:101:5:103:5 | <Expr>; |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:100:25:110:1 | { ... } |
 | Test.kt:102:9:102:25 | throw ... | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:101:5:103:5 | ... -> ... |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:101:5:103:5 | <Expr>; |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:101:5:103:5 | ... -> ... |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:101:5:103:5 | <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 | { ... } |

java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.expected

@@ -208,6 +208,12 @@
 | Test.kt:101:9:103:5 | ... -> ... | Test.kt:100:25:110:1 | { ... } |
 | Test.kt:101:9:103:5 | ... -> ... | Test.kt:101:5:103:5 | <Expr>; |
 | Test.kt:102:9:102:25 | throw ... | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:101:5:103:5 | <Expr>; |
+| Test.kt:105:5:109:5 | <Expr>; | Test.kt:101:9:103:5 | ... -> ... |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:101:5:103:5 | <Expr>; |
+| Test.kt:105:9:107:5 | ... -> ... | Test.kt:101:9:103:5 | ... -> ... |
 | 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 | { ... } |