diff options
| -rw-r--r-- | compiler/semstmts.nim | 11 | ||||
| -rw-r--r-- | tests/controlflow/tunreachable2.nim | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index 530490f42..bb34d8a64 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -190,18 +190,19 @@ proc implicitlyDiscardable(n: PNode): bool = else: result = false -proc endsInNoReturn(n: PNode, returningNode: var PNode): bool = +proc endsInNoReturn(n: PNode, returningNode: var PNode; discardableCheck = false): bool = ## check if expr ends the block like raising or call of noreturn procs do result = false # assume it does return template checkBranch(branch) = - if not endsInNoReturn(branch, returningNode): + if not endsInNoReturn(branch, returningNode, discardableCheck): # proved a branch returns return false var it = n # skip these beforehand, no special handling needed - while it.kind in skipForDiscardable and it.len > 0: + let skips = if discardableCheck: skipForDiscardable else: skipForDiscardable-{nkBlockExpr, nkBlockStmt} + while it.kind in skips and it.len > 0: it = it.lastSon case it.kind @@ -245,7 +246,7 @@ proc endsInNoReturn(n: PNode, returningNode: var PNode): bool = var lastIndex = it.len - 1 if it[lastIndex].kind == nkFinally: # if finally is noreturn, then the entire statement is noreturn - if endsInNoReturn(it[lastIndex][^1], returningNode): + if endsInNoReturn(it[lastIndex][^1], returningNode, discardableCheck): return true dec lastIndex for i in 1 .. lastIndex: @@ -291,7 +292,7 @@ proc discardCheck(c: PContext, result: PNode, flags: TExprFlags) = else: # Ignore noreturn procs since they don't have a type var n = result - if result.endsInNoReturn(n): + if result.endsInNoReturn(n, discardableCheck = true): return var s = "expression '" & $n & "' is of type '" & diff --git a/tests/controlflow/tunreachable2.nim b/tests/controlflow/tunreachable2.nim new file mode 100644 index 000000000..a658880f0 --- /dev/null +++ b/tests/controlflow/tunreachable2.nim @@ -0,0 +1,12 @@ +discard """ + matrix: "--warningAsError:UnreachableCode" +""" + +proc test(): bool = + block okay: + if true: break okay + return false + + return true # Line 7 is here + +doAssert test() |