fixes #12827 (#12829) [backport]

(cherry picked from commit 13d232ec56)
This commit is contained in:
cooldome
2019-12-10 06:08:46 +00:00
committed by narimiran
parent 65aa564c54
commit d807c4b7c0
2 changed files with 22 additions and 4 deletions

View File

@@ -931,11 +931,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..<safeLen(n):
allPathsInBranch(n[i])

View File

@@ -7,6 +7,7 @@ axc
0 new: 0
...
destroying GenericObj[T] GenericObj[system.int]
test
'''
"""
@@ -117,3 +118,19 @@ proc main12() =
echo "..."
main12()
#####################################################################
## bug #12827
type
MyObject = object
x: string
y: seq[string]
needs_ref: ref int
proc xx(xml: string): MyObject =
let stream = xml
result.x = xml
defer: echo stream
discard xx("test")