Merge pull request github#15641 from igfoo/igfoo/controlflow-dom

Kotlin 2: Accept changes in library-tests/controlflow/dominance
rdmarsh2 · Feb 16, 2024 · 3f696c0 · 3f696c0
2 parents 92009f5 + 9069218
commit 3f696c0
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
@@ -14,12 +14,12 @@
 | Test.kt:8:3:8:18 | y | Test.kt:11:3:16:3 | <Expr>; |
 | Test.kt:8:17:8:18 | 50 | Test.kt:8:3:8:18 | y |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
-| Test.kt:11:3:16:3 | when ... | Test.kt:11:7:11:11 | ... -> ... |
+| Test.kt:11:3:16:3 | when ... | Test.kt:11:7:14:3 | ... -> ... |
 | Test.kt:11:7:11:7 | x | Test.kt:11:11:11:11 | 0 |
-| Test.kt:11:7:11:11 | ... -> ... | Test.kt:11:7:11:7 | x |
 | Test.kt:11:7:11:11 | ... > ... | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:11:7:11:11 | ... > ... | Test.kt:14:10:16:3 | ... -> ... |
 | Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:20 | <Expr>; |
+| Test.kt:11:7:14:3 | ... -> ... | Test.kt:11:7:11:7 | x |
 | Test.kt:11:11:11:11 | 0 | Test.kt:11:7:11:11 | ... > ... |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:9 | <Expr>; |
 | Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:9 | <Expr>; |
@@ -39,16 +39,15 @@
 | Test.kt:18:8:18:12 | ... + ... | Test.kt:18:7:18:20 | (...)... |
 | Test.kt:18:12:18:12 | y | Test.kt:18:8:18:12 | ... + ... |
 | Test.kt:21:3:24:11 | <Expr>; | Test.kt:21:3:24:11 | when ... |
-| Test.kt:21:3:24:11 | when ... | Test.kt:21:7:21:11 | ... -> ... |
+| Test.kt:21:3:24:11 | when ... | Test.kt:21:7:22:9 | ... -> ... |
 | Test.kt:21:7:21:7 | x | Test.kt:21:11:21:11 | 0 |
-| Test.kt:21:7:21:11 | ... -> ... | Test.kt:21:7:21:7 | x |
 | Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | test |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:9 | { ... } |
+| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:9 | <Expr>; |
 | Test.kt:21:7:21:11 | ... < ... | Test.kt:24:4:24:11 | ... -> ... |
+| Test.kt:21:7:22:9 | ... -> ... | Test.kt:21:7:21:7 | x |
 | Test.kt:21:11:21:11 | 0 | Test.kt:21:7:21:11 | ... < ... |
 | Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:8 | <Expr>; |
 | Test.kt:22:4:22:9 | <Expr>; | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:4:22:9 | { ... } | Test.kt:22:4:22:9 | <Expr>; |
 | Test.kt:22:8:22:9 | 40 | Test.kt:22:4:22:9 | ...=... |
 | Test.kt:24:4:24:11 | ... -> ... | Test.kt:24:4:24:11 | true |
 | Test.kt:24:4:24:11 | true | Test.kt:24:11:24:11 | z |
@@ -57,11 +56,11 @@
 | Test.kt:27:3:27:8 | <Expr>; | Test.kt:27:7:27:8 | 10 |
 | Test.kt:27:7:27:8 | 10 | Test.kt:27:3:27:8 | ...=... |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | when ... |
-| Test.kt:30:3:33:3 | when ... | Test.kt:30:7:30:12 | ... -> ... |
+| Test.kt:30:3:33:3 | when ... | Test.kt:30:7:33:3 | ... -> ... |
 | Test.kt:30:7:30:7 | x | Test.kt:30:12:30:12 | 0 |
 | Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:30:7:30:12 | ... -> ... | Test.kt:30:7:30:7 | x |
+| Test.kt:30:7:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
 | Test.kt:30:12:30:12 | 0 | Test.kt:30:7:30:12 | ... (value equals) ... |
 | Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:9 | <Expr>; |
 | Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:9 | <Expr>; |
@@ -127,11 +126,11 @@
 | Test.kt:87:4:87:9 | <Expr>; | Test.kt:87:8:87:9 | 10 |
 | Test.kt:87:8:87:9 | 10 | Test.kt:87:4:87:9 | ...=... |
 | Test.kt:88:4:91:4 | <Expr>; | Test.kt:88:4:91:4 | when ... |
-| Test.kt:88:4:91:4 | when ... | Test.kt:88:8:88:14 | ... -> ... |
+| Test.kt:88:4:91:4 | when ... | Test.kt:88:8:91:4 | ... -> ... |
 | Test.kt:88:8:88:8 | a | Test.kt:88:12:88:14 | 100 |
-| Test.kt:88:8:88:14 | ... -> ... | Test.kt:88:8:88:8 | a |
 | Test.kt:88:8:88:14 | ... > ... | Test.kt:88:17:91:4 | { ... } |
 | Test.kt:88:8:88:14 | ... > ... | Test.kt:92:4:93:9 | <Expr>; |
+| Test.kt:88:8:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
 | Test.kt:88:12:88:14 | 100 | Test.kt:88:8:88:14 | ... > ... |
 | Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:10 | <Expr>; |
 | Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:9 | <Expr>; |
@@ -140,19 +139,19 @@
 | Test.kt:90:5:90:9 | <Expr>; | Test.kt:90:9:90:9 | c |
 | Test.kt:90:9:90:9 | c | Test.kt:90:5:90:9 | ...=... |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
-| Test.kt:92:4:93:9 | when ... | Test.kt:92:8:92:14 | ... -> ... |
+| Test.kt:92:4:93:9 | when ... | Test.kt:92:8:93:9 | ... -> ... |
 | Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | test2 |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
-| Test.kt:92:8:92:14 | ... -> ... | Test.kt:92:8:92:8 | a |
+| Test.kt:92:8:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
 | Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
 | Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
 | Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
-| Test.kt:94:4:95:12 | when ... | Test.kt:94:8:94:14 | ... -> ... |
+| Test.kt:94:4:95:12 | when ... | Test.kt:94:8:95:12 | ... -> ... |
 | Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
 | Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
-| Test.kt:94:8:94:14 | ... -> ... | Test.kt:94:8:94:8 | a |
+| Test.kt:94:8:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
 | Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
 | Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
 | Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |