Undo accidental bugfix

owen-mc · owen-mc · commit 52f58ecb9a65 · 2024-11-15T10:25:05.000Z
This is unrelated to the main purpose of this PR. I have made a separate PR to do it here: #17988
diff --git a/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/UnreachableBlocks.qll
@@ -221,7 +221,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
-      failingCaseBlock.bbDominates(this)
+      constSwitchStmt.getAFailingCase().getBasicBlock().bbDominates(this)
     )
   }
 }
diff --git a/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected b/java/ql/test/library-tests/unreachableblocks/UnreachableBlocks.expected
@@ -3,6 +3,7 @@
 | 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
`@@ -221,7 +221,7 @@ class UnreachableBasicBlock extends BasicBlock {`
`221`	`221`	`// Not accessible from the successful case`
`222`	`222`	`not constSwitchStmt.getMatchingCase().getBasicBlock().getABBSuccessor*() = failingCaseBlock and`
`223`	`223`	`// Blocks dominated by the failing case block are unreachable`
`224`		`- failingCaseBlock.bbDominates(this)`
	`224`	`+ constSwitchStmt.getAFailingCase().getBasicBlock().bbDominates(this)`
`225`	`225`	`)`
`226`	`226`	`}`
`227`	`227`	`}`