fixes #12827 (#12829) [backport]

This commit is contained in:
cooldome 2019-12-10 06:08:46 +00:00 • committed by Andreas Rumpf
commit 13d232ec56
2 changed files with 22 additions and 4 deletions

View file

@ -945,11 +945,12 @@ proc allPathsAsgnResult(n: PNode): InitResultEnum =
# assignment this is not good enough! The only pattern we allow for
# is 'finally: result = x'
result = InitSkippable
for it in n:
if it.kind == nkFinally:
result = allPathsAsgnResult(it.lastSon)
allPathsInBranch(n[0])
for i in 1..<n.len:
if n[i].kind == nkFinally:
result = allPathsAsgnResult(n[i].lastSon)
else:
allPathsInBranch(it.lastSon)
allPathsInBranch(n[i].lastSon)
else:
for i in 0..<n.safeLen:
allPathsInBranch(n[i])