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

--gc:destructors: bugfixes

Browse source
This commit is contained in:
Araq 2019-11-09 20:34:51 +01:00
commit a4d43d7d0c
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/liftdestructors.nim
View file

@ -45,7 +45,10 @@ proc fillBodyTup(c: var TLiftCtx; t: PType; body, x, y: PNode) =
proc dotField(x: PNode, f: PSym): PNode = proc dotField(x: PNode, f: PSym): PNode =
result = newNodeI(nkDotExpr, x.info, 2) result = newNodeI(nkDotExpr, x.info, 2)
result.sons[0] = x if x.typ.skipTypes(abstractInst).kind == tyVar:
result.sons[0] = x.newDeref
else:
result.sons[0] = x
result.sons[1] = newSymNode(f, x.info) result.sons[1] = newSymNode(f, x.info)
result.typ = f.typ result.typ = f.typ
@ -513,7 +516,7 @@ proc fillBody(c: var TLiftCtx; t: PType; body, x, y: PNode) =
case t.kind case t.kind
of tyNone, tyEmpty, tyVoid: discard of tyNone, tyEmpty, tyVoid: discard
of tyPointer, tySet, tyBool, tyChar, tyEnum, tyInt..tyUInt64, tyCString, of tyPointer, tySet, tyBool, tyChar, tyEnum, tyInt..tyUInt64, tyCString,
tyPtr, tyOpt, tyUncheckedArray: tyPtr, tyOpt, tyUncheckedArray, tyVar, tyLent:
defaultOp(c, t, body, x, y) defaultOp(c, t, body, x, y)
of tyRef: of tyRef:
if c.g.config.selectedGC == gcDestructors: if c.g.config.selectedGC == gcDestructors:
@ -574,7 +577,7 @@ proc fillBody(c: var TLiftCtx; t: PType; body, x, y: PNode) =
fillBodyObjT(c, t, body, x, y) fillBodyObjT(c, t, body, x, y)
of tyDistinct: of tyDistinct:
if not considerUserDefinedOp(c, t, body, x, y): if not considerUserDefinedOp(c, t, body, x, y):
fillBody(c, t.sons[0].skipTypes(skipPtrs), body, x, y) fillBody(c, t.sons[0], body, x, y)
of tyTuple: of tyTuple:
fillBodyTup(c, t, body, x, y) fillBodyTup(c, t, body, x, y)
of tyVarargs, tyOpenArray: of tyVarargs, tyOpenArray:
@ -589,9 +592,6 @@ proc fillBody(c: var TLiftCtx; t: PType; body, x, y: PNode) =
tyTypeDesc, tyGenericInvocation, tyForward: tyTypeDesc, tyGenericInvocation, tyForward:
#internalError(c.g.config, c.info, "assignment requested for type: " & typeToString(t)) #internalError(c.g.config, c.info, "assignment requested for type: " & typeToString(t))
discard discard
of tyVar, tyLent:
if c.kind != attachedDestructor:
fillBody(c, lastSon(t), body, x, y)
of tyOrdinal, tyRange, tyInferred, of tyOrdinal, tyRange, tyInferred,
tyGenericInst, tyStatic, tyAlias, tySink: tyGenericInst, tyStatic, tyAlias, tySink:
fillBody(c, lastSon(t), body, x, y) fillBody(c, lastSon(t), body, x, y)