Fix bug in UnreachableBlocks

owen-mc · owen-mc · commit efb34aea4533 · 2024-11-14T14:50:25.000Z
diff --git 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
@@ -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 |

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ class UnreachableBasicBlock extends BasicBlock {`
`223`	`223`	`// Not accessible from the successful case`
`224`	`224`	`not constSwitchStmt.getMatchingCase().getBasicBlock().getABBSuccessor*() = failingCaseBlock and`
`225`	`225`	`// Blocks dominated by the failing case block are unreachable`
`226`		`- constSwitchStmt.getAFailingCase().getBasicBlock().bbDominates(this)`
	`226`	`+ failingCaseBlock.bbDominates(this)`
`227`	`227`	`)`
`228`	`228`	`}`
`229`	`229`	`}`