destructors: irresponsibly simple tcustomseq test works

This commit is contained in:
Andreas Rumpf
2017-10-17 22:04:40 +02:00
parent e7f37d7223
commit 35c8b5e3bc
3 changed files with 133 additions and 11 deletions

View File

@@ -318,16 +318,9 @@ proc overloadedAsgn(c: PContext; dest, src: PNode): PNode =
proc liftTypeBoundOps*(c: PContext; typ: PType; info: TLineInfo) =
## In the semantic pass this is called in strategic places
## to ensure we lift assignment, destructors and moves properly.
## Since this is done in the sem* routines generics already have
## been resolved for us and do not complicate the logic any further.
## We have to ensure that the 'tfHasDesctructor' flags bubbles up
## in the generic instantiations though.
## The later 'destroyer' pass depends on it.
if not newDestructors or not hasDestructor(typ): return
# we generate the destructor first so that other operators can depend on it:
if typ.destructor == nil:
liftBody(c, typ, attachedDestructor, info)
if typ.assignment == nil:
liftBody(c, typ, attachedAsgn, info)
if typ.sink == nil:
liftBody(c, typ, attachedSink, info)
if typ.destructor == nil: liftBody(c, typ, attachedDestructor, info)
if typ.assignment == nil: liftBody(c, typ, attachedAsgn, info)
if typ.sink == nil: liftBody(c, typ, attachedSink, info)

View File

@@ -363,7 +363,10 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
# '=' needs to be instantiated for generics when the type is constructed:
newbody.field = cl.c.instTypeBoundOp(cl.c, opr, result, cl.info,
attachedAsgn, 1)
if not newDestructors: typeBound(assignment)
if newDestructors:
typeBound(destructor)
typeBound(sink)
typeBound(assignment)
let methods = skipTypes(bbody, abstractPtrs).methods
for col, meth in items(methods):
# we instantiate the known methods belonging to that type, this causes