From efb34aea45331adabba07c5556b0ac4c77011b6e Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan Date: Thu, 14 Nov 2024 14:50:25 +0000 Subject: [PATCH] Fix bug in UnreachableBlocks --- java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll | 2 +- .../library-tests/unreachableblocks/UnreachableBlocks.expected | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll index 3145371561a..08ab199af58 100644 --- a/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll +++ b/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll @@ -223,7 +223,7 @@ class UnreachableBasicBlock extends BasicBlock { // Not accessible from the successful case not constSwitchStmt.getMatchingCase().getBasicBlock().getABBSuccessor*() = failingCaseBlock and // Blocks dominated by the failing case block are unreachable - constSwitchStmt.getAFailingCase().getBasicBlock().bbDominates(this) + failingCaseBlock.bbDominates(this) ) } } diff --git a/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected b/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected index 35178b0a349..6bd76ea4b96 100644 --- a/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected +++ b/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected @@ -3,7 +3,6 @@ | unreachableblocks/Unreachable.java:12:22:14:3 | { ... } | | unreachableblocks/Unreachable.java:17:3:17:9 | case ... | | unreachableblocks/Unreachable.java:19:3:19:9 | case ... | -| unreachableblocks/Unreachable.java:22:3:22:9 | case ... | | unreachableblocks/Unreachable.java:24:3:24:9 | case ... | | unreachableblocks/Unreachable.java:26:3:26:10 | case ... | | unreachableblocks/Unreachable.java:27:3:27:10 | default |