jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make tests green again

Browse source
This commit is contained in:
Andreas Rumpf 2018-03-24 11:30:29 +01:00
commit 2e7a0e1cdd
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/parampatterns.nim
View file

@ -183,8 +183,15 @@ proc exprRoot*(n: PNode): PSym =
while true: while true:
case it.kind case it.kind
of nkSym: return it.sym of nkSym: return it.sym
of nkHiddenDeref, nkDerefExpr:
if it[0].typ.skipTypes(abstractInst).kind in {tyPtr, tyRef}:
# 'ptr' is unsafe anyway and 'ref' is always on the heap,
# so allow these derefs:
break
else:
it = it[0]
of nkDotExpr, nkBracketExpr, nkHiddenAddr, of nkDotExpr, nkBracketExpr, nkHiddenAddr,
nkObjUpConv, nkObjDownConv, nkCheckedFieldExpr, nkHiddenDeref: nkObjUpConv, nkObjDownConv, nkCheckedFieldExpr:
it = it[0] it = it[0]
of nkHiddenStdConv, nkHiddenSubConv, nkConv: of nkHiddenStdConv, nkHiddenSubConv, nkConv:
it = it[1] it = it[1]
@ -199,8 +206,6 @@ proc exprRoot*(n: PNode): PSym =
else: else:
break break
else: else:
# nkDerefExpr: assume the 'var T' addresses
# the heap and so the location is not on the stack.
break break
proc isAssignable*(owner: PSym, n: PNode; isUnsafeAddr=false): TAssignableResult = proc isAssignable*(owner: PSym, n: PNode; isUnsafeAddr=false): TAssignableResult =