@@ -100,24 +100,18 @@ predicate allowlist(Stmt s) {
   )
 }
 
-/** Holds if `s` is part of a non-reportable prefix of a run of unreachable statements. */
-predicate isInNonReportableUnreachablePrefix(Stmt s) {
+Stmt firstNonAllowlisted(Stmt s) {
+  not allowlist(s) and result = s
+  or
   allowlist(s) and
-  (
-    firstUnreachableStmt(s)
-    or
-    isInNonReportableUnreachablePrefix(getPreviousStmt(s))
-  )
+  exists(Stmt next | getPreviousStmt(next) = s | result = firstNonAllowlisted(next))
 }
 
 /** Holds if `s` is the first non-allowlisted statement in a run of unreachable statements. */
 predicate firstNonAllowlistedUnreachableStmt(Stmt s) {
-  not isReachable(s) and
-  not allowlist(s) and
-  (
-    firstUnreachableStmt(s)
-    or
-    isInNonReportableUnreachablePrefix(getPreviousStmt(s))
+  exists(Stmt unreachable |
+    firstUnreachableStmt(unreachable) and
+    s = firstNonAllowlisted(unreachable)
   )
 }
Original file line number	Diff line number	Diff line change
`@@ -100,24 +100,18 @@ predicate allowlist(Stmt s) {`
`100`	`100`	`)`
`101`	`101`	`}`
`102`	`102`
`103`		-/** Holds if `s` is part of a non-reportable prefix of a run of unreachable statements. */
`104`		`-predicate isInNonReportableUnreachablePrefix(Stmt s) {`
	`103`	`+Stmt firstNonAllowlisted(Stmt s) {`
	`104`	`+ not allowlist(s) and result = s`
	`105`	`+ or`
`105`	`106`	`allowlist(s) and`
`106`		`- (`
`107`		`- firstUnreachableStmt(s)`
`108`		`- or`
`109`		`- isInNonReportableUnreachablePrefix(getPreviousStmt(s))`
`110`		`- )`
	`107`	`+ exists(Stmt next \| getPreviousStmt(next) = s \| result = firstNonAllowlisted(next))`
`111`	`108`	`}`
`112`	`109`
`113`	`110`	/** Holds if `s` is the first non-allowlisted statement in a run of unreachable statements. */
`114`	`111`	`predicate firstNonAllowlistedUnreachableStmt(Stmt s) {`
`115`		`- not isReachable(s) and`
`116`		`- not allowlist(s) and`
`117`		`- (`
`118`		`- firstUnreachableStmt(s)`
`119`		`- or`
`120`		`- isInNonReportableUnreachablePrefix(getPreviousStmt(s))`
	`112`	`+ exists(Stmt unreachable \|`
	`113`	`+ firstUnreachableStmt(unreachable) and`
	`114`	`+ s = firstNonAllowlisted(unreachable)`
`121`	`115`	`)`
`122`	`116`	`}`
`123`	`117`