Merge pull request github#11675 from tamasvajk/kotlin-error-expr-consistency

tamasvajk · web-flow · commit 8e500ec0f308 · 2022-12-13T20:22:47.000+01:00
Kotlin: Report CFG dead end consistency issues on `ErrorExpr`
diff --git a/java/ql/consistency-queries/cfgDeadEnds.ql b/java/ql/consistency-queries/cfgDeadEnds.ql
@@ -53,8 +53,6 @@ predicate shouldBeDeadEnd(ControlFlowNode n) {
   not exists(n.getFile().getRelativePath()) // TODO
   or
   n = any(ConstCase c).getValue(_) // TODO
-  or
-  n instanceof ErrorExpr // TODO
 }
 
 from ControlFlowNode n, string s
diff --git a/java/ql/test/kotlin/library-tests/exprs/CONSISTENCY/cfgDeadEnds.expected b/java/ql/test/kotlin/library-tests/exprs/CONSISTENCY/cfgDeadEnds.expected
@@ -1 +1,2 @@
+| exprs.kt:278:52:278:66 | <error expr> | ErrorExpr | unexpected dead end |
 | exprs.kt:278:52:278:66 | { ... } | BlockStmt | unexpected dead end |

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ predicate shouldBeDeadEnd(ControlFlowNode n) {`
`53`	`53`	`not exists(n.getFile().getRelativePath()) // TODO`
`54`	`54`	`or`
`55`	`55`	`n = any(ConstCase c).getValue(_) // TODO`
`56`		`- or`
`57`		`- n instanceof ErrorExpr // TODO`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`from ControlFlowNode n, string s`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+\| exprs.kt:278:52:278:66 \| <error expr> \| ErrorExpr \| unexpected dead end \|`
`1`	`2`	`\| exprs.kt:278:52:278:66 \| { ... } \| BlockStmt \| unexpected dead end \|`