diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/liftdestructors.nim | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/compiler/liftdestructors.nim b/compiler/liftdestructors.nim index 943dd074e..45a66e795 100644 --- a/compiler/liftdestructors.nim +++ b/compiler/liftdestructors.nim @@ -42,6 +42,9 @@ proc at(a, i: PNode, elemType: PType): PNode = result[1] = i result.typ = elemType +proc destructorOverriden(t: PType): bool = + t.attachedOps[attachedDestructor] != nil and sfOverriden in t.attachedOps[attachedDestructor].flags + proc fillBodyTup(c: var TLiftCtx; t: PType; body, x, y: PNode) = for i in 0..<t.len: let lit = lowerings.newIntLit(c.g, x.info, i) @@ -292,8 +295,10 @@ proc instantiateGeneric(c: var TLiftCtx; op: PSym; t, typeInst: PType): PSym = proc considerAsgnOrSink(c: var TLiftCtx; t: PType; body, x, y: PNode; field: var PSym): bool = if optSeqDestructors in c.g.config.globalOptions: - let op = field - if field != nil and sfOverriden in field.flags: + var op = field + let destructorOverriden = destructorOverriden(t) + if op != nil and op != c.fn and + (sfOverriden in op.flags or destructorOverriden): if sfError in op.flags: incl c.fn.flags, sfError #else: @@ -301,6 +306,10 @@ proc considerAsgnOrSink(c: var TLiftCtx; t: PType; body, x, y: PNode; onUse(c.info, op) body.add newHookCall(c, op, x, y) result = true + elif op == nil and destructorOverriden: + op = produceSym(c.g, c.c, t, c.kind, c.info, c.idgen) + body.add newHookCall(c, op, x, y) + result = true elif tfHasAsgn in t.flags: var op: PSym if sameType(t, c.asgnForType): @@ -909,8 +918,7 @@ proc produceSym(g: ModuleGraph; c: PContext; typ: PType; kind: TTypeAttachedOp; # register this operation already: typ.attachedOps[kind] = result - if kind == attachedSink and typ.attachedOps[attachedDestructor] != nil and - sfOverriden in typ.attachedOps[attachedDestructor].flags: + if kind == attachedSink and destructorOverriden(typ): ## compiler can use a combination of `=destroy` and memCopy for sink op dest.flags.incl sfCursor result.ast[bodyPos].add newOpCall(a, typ.attachedOps[attachedDestructor], d[0]) |