Make test pass

Author: owen-mc

go/ql/src/RedundantCode/UnreachableStatement.ql

@@ -101,10 +101,13 @@ predicate allowlist(Stmt s) {
 }
 
 Stmt firstNonAllowlisted(Stmt s) {
-  not allowlist(s) and result = s
-  or
-  allowlist(s) and
-  exists(Stmt next | getPreviousStmt(next) = s | result = firstNonAllowlisted(next))
+  not isReachable(s) and
+  (
+    not allowlist(s) and result = s
+    or
+    allowlist(s) and
+    exists(Stmt next | getPreviousStmt(next) = s | result = firstNonAllowlisted(next))
+  )
 }
 
 /** Holds if `s` is the first non-allowlisted statement in a run of unreachable statements. */

go/ql/test/query-tests/RedundantCode/UnreachableStatement/UnreachableStatement.expected

@@ -11,4 +11,3 @@
 | main.go:153:2:153:22 | return statement | This statement is unreachable. |
 | main.go:159:2:159:43 | return statement | This statement is unreachable. |
 | main.go:171:2:171:14 | expression statement | This statement is unreachable. |
-| main.go:177:1:178:12 | labeled statement | This statement is unreachable. |

go/ql/test/query-tests/RedundantCode/UnreachableStatement/main.go

@@ -175,7 +175,7 @@ func test22() {
 	goto reachableLabel
 	panic("unreachable") // OK: allowlisted statement
 reachableLabel:
-	reachable() // $ SPURIOUS: Alert // OK: reachable through the goto
+	reachable() // OK: reachable through the goto
 }
 
 func test23() {