From 1a42c4ed6a29159bdba5737d4a8fe2cb67677668 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Thu, 19 Nov 2026 11:50:44 +0100 Subject: [PATCH 1/2] Java: Tweak guards test. --- java/ql/test/library-tests/guards/Guards.java | 16 +++++------ .../guards/GuardsInline.expected | 28 +++++++++---------- .../test/library-tests/guards/GuardsInline.ql | 7 ++--- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/java/ql/test/library-tests/guards/Guards.java b/java/ql/test/library-tests/guards/Guards.java index 35e3b7c09a9a..1f1a4b7f7f15 100644 --- a/java/ql/test/library-tests/guards/Guards.java +++ b/java/ql/test/library-tests/guards/Guards.java @@ -36,13 +36,13 @@ void t1(int[] a, String s) { s = "bar"; switch (s) { case "bar": - chk(); // $ guarded='s:match "bar"' guarded='s:bar' + chk(); // $ guarded='"bar":match' guarded='s:bar' break; case "foo": - chk(); // $ guarded='s:non-match "bar"' guarded='s:not bar' guarded='s:match "foo"' guarded='s:foo' guarded=g(3):false + chk(); // $ guarded='"bar":no match' guarded='s:not bar' guarded='"foo":match' guarded='s:foo' guarded=g(3):false break; default: - chk(); // $ guarded='s:non-match "bar"' guarded='s:non-match "foo"' guarded='s:not bar' guarded='s:not foo' guarded=g(3):false + chk(); // $ guarded='"bar":no match' guarded='"foo":no match' guarded='s:not bar' guarded='s:not foo' guarded=g(3):false break; } @@ -89,13 +89,13 @@ void t4() { chk(); // $ guarded='x == null:true' guarded='x:null' guarded=g(1):false guarded=g(2):false guarded=g(Alt2):false guarded=g(3):false switch (x) { case E1: - chk(); // $ guarded='x:match E1' guarded='x:E1' guarded=g(1):true guarded=g(2):false guarded=g(Alt2):false guarded=g(3):false + chk(); // $ guarded='E1:match' guarded='x:E1' guarded=g(1):true guarded=g(2):false guarded=g(Alt2):false guarded=g(3):false break; case E2: - chk(); // $ guarded='x:non-match E1' guarded='x:not E1' guarded='x:match E2' guarded='x:E2' guarded=g(3):false + chk(); // $ guarded='E1:no match' guarded='x:not E1' guarded='E2:match' guarded='x:E2' guarded=g(3):false break; case E3: - chk(); // $ guarded='x:non-match E1' guarded='x:non-match E2' guarded='x:not E1' guarded='x:not E2' guarded='x:match E3' guarded='x:E3' guarded=g(3):true + chk(); // $ guarded='E1:no match' guarded='E2:no match' guarded='x:not E1' guarded='x:not E2' guarded='E3:match' guarded='x:E3' guarded=g(3):true break; } Object o = g(4) ? new Object() : null; @@ -195,10 +195,10 @@ void testWrappers(String s, Integer i) { switch (testEnumWrapper(g(1))) { case SUCCESS: - chk(); // $ guarded='testEnumWrapper(...):SUCCESS' guarded='testEnumWrapper(...):match SUCCESS' guarded=g(1):true + chk(); // $ guarded='testEnumWrapper(...):SUCCESS' guarded='SUCCESS:match' guarded=g(1):true break; case FAILURE: - chk(); // $ guarded='testEnumWrapper(...):not SUCCESS' guarded='testEnumWrapper(...):non-match SUCCESS' guarded='testEnumWrapper(...):FAILURE' guarded='testEnumWrapper(...):match FAILURE' guarded=g(1):false + chk(); // $ guarded='testEnumWrapper(...):not SUCCESS' guarded='SUCCESS:no match' guarded='testEnumWrapper(...):FAILURE' guarded='FAILURE:match' guarded=g(1):false break; } } diff --git a/java/ql/test/library-tests/guards/GuardsInline.expected b/java/ql/test/library-tests/guards/GuardsInline.expected index 9d5ea1992c69..b3985e01d76f 100644 --- a/java/ql/test/library-tests/guards/GuardsInline.expected +++ b/java/ql/test/library-tests/guards/GuardsInline.expected @@ -14,15 +14,15 @@ | Guards.java:29:7:29:11 | chk(...) | 'a:not null' | | Guards.java:29:7:29:11 | chk(...) | 'i < sz:true' | | Guards.java:29:7:29:11 | chk(...) | 'sz:Lower bound 1' | +| Guards.java:39:9:39:13 | chk(...) | '"bar":match' | | Guards.java:39:9:39:13 | chk(...) | 's:bar' | -| Guards.java:39:9:39:13 | chk(...) | 's:match "bar"' | +| Guards.java:42:9:42:13 | chk(...) | '"bar":no match' | +| Guards.java:42:9:42:13 | chk(...) | '"foo":match' | | Guards.java:42:9:42:13 | chk(...) | 's:foo' | -| Guards.java:42:9:42:13 | chk(...) | 's:match "foo"' | -| Guards.java:42:9:42:13 | chk(...) | 's:non-match "bar"' | | Guards.java:42:9:42:13 | chk(...) | 's:not bar' | | Guards.java:42:9:42:13 | chk(...) | g(3):false | -| Guards.java:45:9:45:13 | chk(...) | 's:non-match "bar"' | -| Guards.java:45:9:45:13 | chk(...) | 's:non-match "foo"' | +| Guards.java:45:9:45:13 | chk(...) | '"bar":no match' | +| Guards.java:45:9:45:13 | chk(...) | '"foo":no match' | | Guards.java:45:9:45:13 | chk(...) | 's:not bar' | | Guards.java:45:9:45:13 | chk(...) | 's:not foo' | | Guards.java:45:9:45:13 | chk(...) | g(3):false | @@ -54,21 +54,21 @@ | Guards.java:89:7:89:11 | chk(...) | g(2):false | | Guards.java:89:7:89:11 | chk(...) | g(3):false | | Guards.java:89:7:89:11 | chk(...) | g(Alt2):false | +| Guards.java:92:9:92:13 | chk(...) | 'E1:match' | | Guards.java:92:9:92:13 | chk(...) | 'x:E1' | -| Guards.java:92:9:92:13 | chk(...) | 'x:match E1' | | Guards.java:92:9:92:13 | chk(...) | g(1):true | | Guards.java:92:9:92:13 | chk(...) | g(2):false | | Guards.java:92:9:92:13 | chk(...) | g(3):false | | Guards.java:92:9:92:13 | chk(...) | g(Alt2):false | +| Guards.java:95:9:95:13 | chk(...) | 'E1:no match' | +| Guards.java:95:9:95:13 | chk(...) | 'E2:match' | | Guards.java:95:9:95:13 | chk(...) | 'x:E2' | -| Guards.java:95:9:95:13 | chk(...) | 'x:match E2' | -| Guards.java:95:9:95:13 | chk(...) | 'x:non-match E1' | | Guards.java:95:9:95:13 | chk(...) | 'x:not E1' | | Guards.java:95:9:95:13 | chk(...) | g(3):false | +| Guards.java:98:9:98:13 | chk(...) | 'E1:no match' | +| Guards.java:98:9:98:13 | chk(...) | 'E2:no match' | +| Guards.java:98:9:98:13 | chk(...) | 'E3:match' | | Guards.java:98:9:98:13 | chk(...) | 'x:E3' | -| Guards.java:98:9:98:13 | chk(...) | 'x:match E3' | -| Guards.java:98:9:98:13 | chk(...) | 'x:non-match E1' | -| Guards.java:98:9:98:13 | chk(...) | 'x:non-match E2' | | Guards.java:98:9:98:13 | chk(...) | 'x:not E1' | | Guards.java:98:9:98:13 | chk(...) | 'x:not E2' | | Guards.java:98:9:98:13 | chk(...) | g(3):true | @@ -115,12 +115,12 @@ | Guards.java:193:7:193:11 | chk(...) | 'concatNonNull(...):not null' | | Guards.java:193:7:193:11 | chk(...) | 'null == concatNonNull(...):false' | | Guards.java:193:7:193:11 | chk(...) | 's:not null' | +| Guards.java:198:9:198:13 | chk(...) | 'SUCCESS:match' | | Guards.java:198:9:198:13 | chk(...) | 'testEnumWrapper(...):SUCCESS' | -| Guards.java:198:9:198:13 | chk(...) | 'testEnumWrapper(...):match SUCCESS' | | Guards.java:198:9:198:13 | chk(...) | g(1):true | +| Guards.java:201:9:201:13 | chk(...) | 'FAILURE:match' | +| Guards.java:201:9:201:13 | chk(...) | 'SUCCESS:no match' | | Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):FAILURE' | -| Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):match FAILURE' | -| Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):non-match SUCCESS' | | Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):not SUCCESS' | | Guards.java:201:9:201:13 | chk(...) | g(1):false | | Guards.java:213:5:213:9 | chk(...) | 'ensureNotNull(...):no exception' | diff --git a/java/ql/test/library-tests/guards/GuardsInline.ql b/java/ql/test/library-tests/guards/GuardsInline.ql index 9f29af6de606..a303e9f5ba9b 100644 --- a/java/ql/test/library-tests/guards/GuardsInline.ql +++ b/java/ql/test/library-tests/guards/GuardsInline.ql @@ -16,17 +16,16 @@ string ppGuard(Guard g, Boolean branch) { "'" ) or - exists(SwitchCase cc, Expr s, string match, string value | + exists(SwitchCase cc, string match, string value | cc = g and - cc.getSelectorExpr() = s and ( cc.(ConstCase).getValue().toString() = value or cc instanceof DefaultCase and value = "default" ) and - if branch = true then match = ":match " else match = ":non-match " + if branch = true then match = ":match" else match = ":no match" | - result = "'" + s.toString() + match + value + "'" + result = "'" + value + match + "'" ) } From b1e25ca5e84b4d5ba48b4c8ee56a1c26c6c39296 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Thu, 19 Nov 2026 11:38:53 +0100 Subject: [PATCH 2/2] Guards: Update Guards-CFG integration to recognize MatchSuccessors. --- .../semmle/code/cpp/controlflow/IRGuards.qll | 33 ++-- .../semmle/code/csharp/controlflow/Guards.qll | 12 +- go/ql/lib/semmle/go/controlflow/Guards.qll | 71 +------- .../go/controlflow/Guards/Guards.expected | 49 +++--- .../semmle/code/java/controlflow/Guards.qll | 17 +- .../test/library-tests/guards/GuardsInline.ql | 12 -- .../library-tests/guards/guardslogic.expected | 12 +- .../test/library-tests/guards/guardslogic.ql | 8 +- .../library-tests/guards12/guard.expected | 156 +++++++++++------- .../controlflow/codeql/controlflow/Guards.qll | 98 ++++++----- 10 files changed, 203 insertions(+), 265 deletions(-) diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll index dad011d93912..54b8c7e6000d 100644 --- a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll +++ b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll @@ -160,23 +160,6 @@ module GuardsInput implements SharedGuards::InputSig; | -| Logic.java:22:7:22:17 | case ... | false | Logic.java:24:7:24:17 | case ... | -| Logic.java:22:7:22:17 | case ... | false | Logic.java:25:9:25:14 | break | -| Logic.java:22:7:22:17 | case ... | false | Logic.java:26:7:26:14 | default | -| Logic.java:22:7:22:17 | case ... | true | Logic.java:23:9:23:14 | break | -| Logic.java:24:7:24:17 | case ... | false | Logic.java:26:7:26:14 | default | -| Logic.java:24:7:24:17 | case ... | true | Logic.java:25:9:25:14 | break | +| Logic.java:22:12:22:16 | "bar" | match | Logic.java:23:9:23:14 | break | +| Logic.java:22:12:22:16 | "bar" | no match | Logic.java:24:7:24:17 | case ... | +| Logic.java:22:12:22:16 | "bar" | no match | Logic.java:25:9:25:14 | break | +| Logic.java:22:12:22:16 | "bar" | no match | Logic.java:26:7:26:14 | default | +| Logic.java:24:12:24:16 | "foo" | match | Logic.java:25:9:25:14 | break | +| Logic.java:24:12:24:16 | "foo" | no match | Logic.java:26:7:26:14 | default | | Logic.java:29:16:29:19 | g(...) | false | Logic.java:29:30:29:30 | s | | Logic.java:29:16:29:19 | g(...) | false | Logic.java:30:30:31:5 | { ... } | | Logic.java:29:16:29:19 | g(...) | true | Logic.java:29:23:29:26 | null | diff --git a/java/ql/test/library-tests/guards/guardslogic.ql b/java/ql/test/library-tests/guards/guardslogic.ql index e68be505ff71..697197f33faf 100644 --- a/java/ql/test/library-tests/guards/guardslogic.ql +++ b/java/ql/test/library-tests/guards/guardslogic.ql @@ -6,5 +6,11 @@ from Guard g, BasicBlock bb, GuardValue gv where g.valueControls(bb, gv) and g.getEnclosingCallable().getDeclaringType().hasName("Logic") and - (exists(gv.asBooleanValue()) or gv.isThrowsException() or gv.getDualValue().isThrowsException()) + ( + exists(gv.asBooleanValue()) or + gv.isThrowsException() or + gv.getDualValue().isThrowsException() or + gv.isMatch() or + gv.getDualValue().isMatch() + ) select g, gv, getFirstAstNode(bb) diff --git a/java/ql/test/library-tests/guards12/guard.expected b/java/ql/test/library-tests/guards12/guard.expected index f88b560c9a40..6055ba2c16e5 100644 --- a/java/ql/test/library-tests/guards12/guard.expected +++ b/java/ql/test/library-tests/guards12/guard.expected @@ -1,76 +1,112 @@ hasBranchEdge -| Test.java:5:7:5:17 | case ... | Test.java:5:7:5:17 | case ... | Test.java:5:19:5:19 | 2 | true | -| Test.java:5:7:5:17 | case ... | Test.java:5:7:5:17 | case ... | Test.java:6:7:6:17 | case ... | false | -| Test.java:6:7:6:17 | case ... | Test.java:6:7:6:17 | case ... | Test.java:6:19:6:19 | 2 | true | -| Test.java:6:7:6:17 | case ... | Test.java:6:7:6:17 | case ... | Test.java:7:7:7:16 | default | false | -| Test.java:11:7:11:17 | case ... | Test.java:11:7:11:17 | case ... | Test.java:11:19:11:21 | { ... } | true | -| Test.java:11:7:11:17 | case ... | Test.java:11:7:11:17 | case ... | Test.java:12:7:12:17 | case ... | false | -| Test.java:12:7:12:17 | case ... | Test.java:12:7:12:17 | case ... | Test.java:12:19:12:21 | { ... } | true | -| Test.java:12:7:12:17 | case ... | Test.java:12:7:12:17 | case ... | Test.java:13:7:13:16 | default | false | -| Test.java:17:7:17:36 | case | Test.java:15:5:15:25 | var ...; | Test.java:17:19:17:19 | After [no-match] | false | -| Test.java:17:7:17:36 | case | Test.java:15:5:15:25 | var ...; | Test.java:17:26:17:28 | len | true | +| Test.java:4:12:4:14 | "a" | Test.java:2:39:36:3 | { ... } | Test.java:4:12:4:14 | After "a" [match] | match | +| Test.java:4:12:4:14 | "a" | Test.java:2:39:36:3 | { ... } | Test.java:4:17:4:19 | "b" | no match | +| Test.java:4:17:4:19 | "b" | Test.java:4:17:4:19 | "b" | Test.java:4:17:4:19 | After "b" [match] | match | +| Test.java:4:17:4:19 | "b" | Test.java:4:17:4:19 | "b" | Test.java:5:7:5:17 | case ... | no match | +| Test.java:5:12:5:14 | "c" | Test.java:5:7:5:17 | case ... | Test.java:5:19:5:19 | 2 | match | +| Test.java:5:12:5:14 | "c" | Test.java:5:7:5:17 | case ... | Test.java:6:7:6:17 | case ... | no match | +| Test.java:6:12:6:14 | "d" | Test.java:6:7:6:17 | case ... | Test.java:6:19:6:19 | 2 | match | +| Test.java:6:12:6:14 | "d" | Test.java:6:7:6:17 | case ... | Test.java:7:7:7:16 | default | no match | +| Test.java:10:12:10:14 | "a" | Test.java:3:9:3:21 | x | Test.java:10:12:10:14 | After "a" [match] | match | +| Test.java:10:12:10:14 | "a" | Test.java:3:9:3:21 | x | Test.java:10:17:10:19 | "b" | no match | +| Test.java:10:17:10:19 | "b" | Test.java:10:17:10:19 | "b" | Test.java:10:17:10:19 | After "b" [match] | match | +| Test.java:10:17:10:19 | "b" | Test.java:10:17:10:19 | "b" | Test.java:11:7:11:17 | case ... | no match | +| Test.java:11:12:11:14 | "c" | Test.java:11:7:11:17 | case ... | Test.java:11:19:11:21 | { ... } | match | +| Test.java:11:12:11:14 | "c" | Test.java:11:7:11:17 | case ... | Test.java:12:7:12:17 | case ... | no match | +| Test.java:12:12:12:14 | "d" | Test.java:12:7:12:17 | case ... | Test.java:12:19:12:21 | { ... } | match | +| Test.java:12:12:12:14 | "d" | Test.java:12:7:12:17 | case ... | Test.java:13:7:13:16 | default | no match | +| Test.java:17:19:17:19 | | Test.java:15:5:15:25 | var ...; | Test.java:17:19:17:19 | After [no-match] | no match | +| Test.java:17:19:17:19 | | Test.java:15:5:15:25 | var ...; | Test.java:17:26:17:28 | len | match | | Test.java:17:26:17:33 | ... == ... | Test.java:17:26:17:28 | len | Test.java:17:26:17:33 | After ... == ... [false] | false | | Test.java:17:26:17:33 | ... == ... | Test.java:17:26:17:28 | len | Test.java:17:38:17:40 | { ... } | true | -| Test.java:18:7:18:17 | case ... | Test.java:18:7:18:17 | case ... | Test.java:18:19:18:21 | { ... } | true | -| Test.java:18:7:18:17 | case ... | Test.java:18:7:18:17 | case ... | Test.java:19:7:19:16 | default | false | +| Test.java:18:12:18:14 | "e" | Test.java:18:7:18:17 | case ... | Test.java:18:19:18:21 | { ... } | match | +| Test.java:18:12:18:14 | "e" | Test.java:18:7:18:17 | case ... | Test.java:19:7:19:16 | default | no match | | Test.java:21:13:21:19 | unknown | Test.java:21:5:21:42 | switch (...) | Test.java:21:23:21:23 | s | true | | Test.java:21:13:21:19 | unknown | Test.java:21:5:21:42 | switch (...) | Test.java:21:27:21:27 | s | false | -| Test.java:22:7:22:17 | case ... | Test.java:22:7:22:17 | case ... | Test.java:22:19:22:21 | { ... } | true | -| Test.java:22:7:22:17 | case ... | Test.java:22:7:22:17 | case ... | Test.java:23:7:23:37 | case | false | -| Test.java:23:7:23:37 | case | Test.java:23:7:23:37 | case | Test.java:23:19:23:20 | After s2 [no-match] | false | -| Test.java:23:7:23:37 | case | Test.java:23:7:23:37 | case | Test.java:23:27:23:29 | len | true | +| Test.java:22:12:22:14 | "f" | Test.java:22:7:22:17 | case ... | Test.java:22:19:22:21 | { ... } | match | +| Test.java:22:12:22:14 | "f" | Test.java:22:7:22:17 | case ... | Test.java:23:7:23:37 | case | no match | +| Test.java:23:19:23:20 | s2 | Test.java:23:7:23:37 | case | Test.java:23:19:23:20 | After s2 [no-match] | no match | +| Test.java:23:19:23:20 | s2 | Test.java:23:7:23:37 | case | Test.java:23:27:23:29 | len | match | | Test.java:23:27:23:34 | ... == ... | Test.java:23:27:23:29 | len | Test.java:23:27:23:34 | After ... == ... [false] | false | | Test.java:23:27:23:34 | ... == ... | Test.java:23:27:23:29 | len | Test.java:23:39:23:41 | { ... } | true | -| Test.java:24:7:24:17 | case ... | Test.java:24:7:24:17 | case ... | Test.java:24:19:24:21 | { ... } | true | -| Test.java:24:7:24:17 | case ... | Test.java:24:7:24:17 | case ... | Test.java:25:7:25:16 | default | false | -| Test.java:28:7:28:15 | case ... | Test.java:27:5:27:14 | switch (...) | Test.java:28:12:28:14 | After "h" [match] | true | -| Test.java:28:7:28:15 | case ... | Test.java:27:5:27:14 | switch (...) | Test.java:29:7:29:34 | case | false | -| Test.java:29:7:29:34 | case | Test.java:29:7:29:34 | case | Test.java:29:19:29:19 | After [no-match] | false | -| Test.java:29:7:29:34 | case | Test.java:29:7:29:34 | case | Test.java:29:26:29:28 | len | true | +| Test.java:24:12:24:14 | "g" | Test.java:24:7:24:17 | case ... | Test.java:24:19:24:21 | { ... } | match | +| Test.java:24:12:24:14 | "g" | Test.java:24:7:24:17 | case ... | Test.java:25:7:25:16 | default | no match | +| Test.java:28:12:28:14 | "h" | Test.java:27:5:27:14 | switch (...) | Test.java:28:12:28:14 | After "h" [match] | match | +| Test.java:28:12:28:14 | "h" | Test.java:27:5:27:14 | switch (...) | Test.java:29:7:29:34 | case | no match | +| Test.java:29:19:29:19 | | Test.java:29:7:29:34 | case | Test.java:29:19:29:19 | After [no-match] | no match | +| Test.java:29:19:29:19 | | Test.java:29:7:29:34 | case | Test.java:29:26:29:28 | len | match | | Test.java:29:26:29:33 | ... == ... | Test.java:29:26:29:28 | len | Test.java:29:26:29:33 | After ... == ... [false] | false | | Test.java:29:26:29:33 | ... == ... | Test.java:29:26:29:28 | len | Test.java:29:26:29:33 | After ... == ... [true] | true | -| Test.java:30:7:30:15 | case ... | Test.java:30:7:30:15 | case ... | Test.java:30:12:30:14 | After "i" [match] | true | -| Test.java:30:7:30:15 | case ... | Test.java:30:7:30:15 | case ... | Test.java:33:7:33:14 | default | false | +| Test.java:30:12:30:14 | "i" | Test.java:30:7:30:15 | case ... | Test.java:30:12:30:14 | After "i" [match] | match | +| Test.java:30:12:30:14 | "i" | Test.java:30:7:30:15 | case ... | Test.java:33:7:33:14 | default | no match | #select -| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | false | Test.java:6:7:6:17 | case ... | -| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | false | Test.java:6:19:6:19 | 2 | -| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | false | Test.java:7:7:7:16 | default | -| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | true | Test.java:5:19:5:19 | 2 | -| Test.java:6:7:6:17 | case ... | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | true | false | Test.java:7:7:7:16 | default | -| Test.java:6:7:6:17 | case ... | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | true | true | Test.java:6:19:6:19 | 2 | -| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | false | Test.java:12:7:12:17 | case ... | -| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | false | Test.java:12:19:12:21 | { ... } | -| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | false | Test.java:13:7:13:16 | default | -| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | true | Test.java:11:19:11:21 | { ... } | -| Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | false | Test.java:13:7:13:16 | default | -| Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | true | Test.java:12:19:12:21 | { ... } | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | match | Test.java:4:12:4:14 | After "a" [match] | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:4:17:4:19 | "b" | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:4:17:4:19 | After "b" [match] | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:5:7:5:17 | case ... | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:5:19:5:19 | 2 | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:6:7:6:17 | case ... | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:6:19:6:19 | 2 | +| Test.java:4:12:4:14 | "a" | Test.java:3:20:3:20 | s | Test.java:4:12:4:14 | "a" | match | no match | Test.java:7:7:7:16 | default | +| Test.java:4:17:4:19 | "b" | Test.java:3:20:3:20 | s | Test.java:4:17:4:19 | "b" | match | match | Test.java:4:17:4:19 | After "b" [match] | +| Test.java:4:17:4:19 | "b" | Test.java:3:20:3:20 | s | Test.java:4:17:4:19 | "b" | match | no match | Test.java:5:7:5:17 | case ... | +| Test.java:4:17:4:19 | "b" | Test.java:3:20:3:20 | s | Test.java:4:17:4:19 | "b" | match | no match | Test.java:5:19:5:19 | 2 | +| Test.java:4:17:4:19 | "b" | Test.java:3:20:3:20 | s | Test.java:4:17:4:19 | "b" | match | no match | Test.java:6:7:6:17 | case ... | +| Test.java:4:17:4:19 | "b" | Test.java:3:20:3:20 | s | Test.java:4:17:4:19 | "b" | match | no match | Test.java:6:19:6:19 | 2 | +| Test.java:4:17:4:19 | "b" | Test.java:3:20:3:20 | s | Test.java:4:17:4:19 | "b" | match | no match | Test.java:7:7:7:16 | default | +| Test.java:5:12:5:14 | "c" | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | match | match | Test.java:5:19:5:19 | 2 | +| Test.java:5:12:5:14 | "c" | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | match | no match | Test.java:6:7:6:17 | case ... | +| Test.java:5:12:5:14 | "c" | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | match | no match | Test.java:6:19:6:19 | 2 | +| Test.java:5:12:5:14 | "c" | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | match | no match | Test.java:7:7:7:16 | default | +| Test.java:6:12:6:14 | "d" | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | match | match | Test.java:6:19:6:19 | 2 | +| Test.java:6:12:6:14 | "d" | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | match | no match | Test.java:7:7:7:16 | default | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | match | Test.java:10:12:10:14 | After "a" [match] | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:10:17:10:19 | "b" | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:10:17:10:19 | After "b" [match] | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:11:7:11:17 | case ... | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:11:19:11:21 | { ... } | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:12:7:12:17 | case ... | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:12:19:12:21 | { ... } | +| Test.java:10:12:10:14 | "a" | Test.java:9:13:9:13 | s | Test.java:10:12:10:14 | "a" | match | no match | Test.java:13:7:13:16 | default | +| Test.java:10:17:10:19 | "b" | Test.java:9:13:9:13 | s | Test.java:10:17:10:19 | "b" | match | match | Test.java:10:17:10:19 | After "b" [match] | +| Test.java:10:17:10:19 | "b" | Test.java:9:13:9:13 | s | Test.java:10:17:10:19 | "b" | match | no match | Test.java:11:7:11:17 | case ... | +| Test.java:10:17:10:19 | "b" | Test.java:9:13:9:13 | s | Test.java:10:17:10:19 | "b" | match | no match | Test.java:11:19:11:21 | { ... } | +| Test.java:10:17:10:19 | "b" | Test.java:9:13:9:13 | s | Test.java:10:17:10:19 | "b" | match | no match | Test.java:12:7:12:17 | case ... | +| Test.java:10:17:10:19 | "b" | Test.java:9:13:9:13 | s | Test.java:10:17:10:19 | "b" | match | no match | Test.java:12:19:12:21 | { ... } | +| Test.java:10:17:10:19 | "b" | Test.java:9:13:9:13 | s | Test.java:10:17:10:19 | "b" | match | no match | Test.java:13:7:13:16 | default | +| Test.java:11:12:11:14 | "c" | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | match | match | Test.java:11:19:11:21 | { ... } | +| Test.java:11:12:11:14 | "c" | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | match | no match | Test.java:12:7:12:17 | case ... | +| Test.java:11:12:11:14 | "c" | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | match | no match | Test.java:12:19:12:21 | { ... } | +| Test.java:11:12:11:14 | "c" | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | match | no match | Test.java:13:7:13:16 | default | +| Test.java:12:12:12:14 | "d" | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | match | match | Test.java:12:19:12:21 | { ... } | +| Test.java:12:12:12:14 | "d" | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | match | no match | Test.java:13:7:13:16 | default | | Test.java:17:26:17:33 | ... == ... | Test.java:17:26:17:28 | len | Test.java:17:33:17:33 | 4 | true | false | Test.java:17:26:17:33 | After ... == ... [false] | | Test.java:17:26:17:33 | ... == ... | Test.java:17:26:17:28 | len | Test.java:17:33:17:33 | 4 | true | true | Test.java:17:38:17:40 | { ... } | -| Test.java:18:7:18:17 | case ... | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | true | false | Test.java:19:7:19:16 | default | -| Test.java:18:7:18:17 | case ... | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | true | true | Test.java:18:19:18:21 | { ... } | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:7:23:37 | case | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:19:23:20 | After s2 [no-match] | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:27:23:29 | len | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:27:23:34 | After ... == ... [false] | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:39:23:41 | { ... } | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:24:7:24:17 | case ... | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:24:19:24:21 | { ... } | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:25:7:25:16 | default | -| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | true | Test.java:22:19:22:21 | { ... } | +| Test.java:18:12:18:14 | "e" | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | match | match | Test.java:18:19:18:21 | { ... } | +| Test.java:18:12:18:14 | "e" | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | match | no match | Test.java:19:7:19:16 | default | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | match | Test.java:22:19:22:21 | { ... } | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:23:7:23:37 | case | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:23:19:23:20 | After s2 [no-match] | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:23:27:23:29 | len | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:23:27:23:34 | After ... == ... [false] | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:23:39:23:41 | { ... } | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:24:7:24:17 | case ... | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:24:19:24:21 | { ... } | +| Test.java:22:12:22:14 | "f" | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | match | no match | Test.java:25:7:25:16 | default | | Test.java:23:27:23:34 | ... == ... | Test.java:23:27:23:29 | len | Test.java:23:34:23:34 | 4 | true | false | Test.java:23:27:23:34 | After ... == ... [false] | | Test.java:23:27:23:34 | ... == ... | Test.java:23:27:23:29 | len | Test.java:23:34:23:34 | 4 | true | true | Test.java:23:39:23:41 | { ... } | -| Test.java:24:7:24:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:24:12:24:14 | "g" | true | false | Test.java:25:7:25:16 | default | -| Test.java:24:7:24:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:24:12:24:14 | "g" | true | true | Test.java:24:19:24:21 | { ... } | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:7:29:34 | case | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:19:29:19 | After [no-match] | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:26:29:28 | len | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:26:29:33 | After ... == ... [false] | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:26:29:33 | After ... == ... [true] | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:30:7:30:15 | case ... | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:30:12:30:14 | After "i" [match] | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:33:7:33:14 | default | -| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | true | Test.java:28:12:28:14 | After "h" [match] | +| Test.java:24:12:24:14 | "g" | Test.java:21:13:21:41 | ...?...:... | Test.java:24:12:24:14 | "g" | match | match | Test.java:24:19:24:21 | { ... } | +| Test.java:24:12:24:14 | "g" | Test.java:21:13:21:41 | ...?...:... | Test.java:24:12:24:14 | "g" | match | no match | Test.java:25:7:25:16 | default | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | match | Test.java:28:12:28:14 | After "h" [match] | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:29:7:29:34 | case | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:29:19:29:19 | After [no-match] | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:29:26:29:28 | len | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:29:26:29:33 | After ... == ... [false] | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:29:26:29:33 | After ... == ... [true] | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:30:7:30:15 | case ... | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:30:12:30:14 | After "i" [match] | +| Test.java:28:12:28:14 | "h" | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | match | no match | Test.java:33:7:33:14 | default | | Test.java:29:26:29:33 | ... == ... | Test.java:29:26:29:28 | len | Test.java:29:33:29:33 | 4 | true | false | Test.java:29:26:29:33 | After ... == ... [false] | | Test.java:29:26:29:33 | ... == ... | Test.java:29:26:29:28 | len | Test.java:29:33:29:33 | 4 | true | true | Test.java:29:26:29:33 | After ... == ... [true] | -| Test.java:30:7:30:15 | case ... | Test.java:27:13:27:13 | s | Test.java:30:12:30:14 | "i" | true | false | Test.java:33:7:33:14 | default | -| Test.java:30:7:30:15 | case ... | Test.java:27:13:27:13 | s | Test.java:30:12:30:14 | "i" | true | true | Test.java:30:12:30:14 | After "i" [match] | +| Test.java:30:12:30:14 | "i" | Test.java:27:13:27:13 | s | Test.java:30:12:30:14 | "i" | match | match | Test.java:30:12:30:14 | After "i" [match] | +| Test.java:30:12:30:14 | "i" | Test.java:27:13:27:13 | s | Test.java:30:12:30:14 | "i" | match | no match | Test.java:33:7:33:14 | default | diff --git a/shared/controlflow/codeql/controlflow/Guards.qll b/shared/controlflow/codeql/controlflow/Guards.qll index 7550363f0ea2..eb08d521f406 100644 --- a/shared/controlflow/codeql/controlflow/Guards.qll +++ b/shared/controlflow/codeql/controlflow/Guards.qll @@ -93,19 +93,6 @@ signature module InputSig