Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions src/core/lifetime.d
Original file line number Diff line number Diff line change
Expand Up @@ -2221,3 +2221,74 @@ pure nothrow @nogc @system unittest
static assert(!__traits(compiles, f(ncarray)));
f(move(ncarray));
}

/**
* This is called for a delete statement where the value
* being deleted is a pointer to a struct with a destructor
* but doesn't have an overloaded delete operator.
*
* Params:
* p = pointer to the value to be deleted
*/
void _d_delstruct(T)(ref T *p)
{
if (p)
{
debug(PRINTF) printf("_d_delstruct(%p)\n", p);

import core.memory : GC;

destroy(*p);
GC.free(p);
p = null;
}
}

@system unittest
{
int dtors = 0;
struct S { ~this() { ++dtors; } }

S *s = new S();
_d_delstruct(s);

assert(s == null);
assert(dtors == 1);
}

@system unittest
{
int innerDtors = 0;
int outerDtors = 0;

struct Inner { ~this() { ++innerDtors; } }
struct Outer
{
Inner *i1;
Inner *i2;

this(int x)
{
i1 = new Inner();
i2 = new Inner();
}

~this()
{
++outerDtors;

_d_delstruct(i1);
assert(i1 == null);

_d_delstruct(i2);
assert(i2 == null);
}
}

Outer *o = new Outer(0);
_d_delstruct(o);

assert(o == null);
assert(innerDtors == 2);
assert(outerDtors == 1);
}
2 changes: 2 additions & 0 deletions src/object.d
Original file line number Diff line number Diff line change
Expand Up @@ -4637,6 +4637,8 @@ public import core.internal.array.construction : _d_arrayctor;
public import core.internal.array.construction : _d_arraysetctor;
public import core.internal.array.capacity: _d_arraysetlengthTImpl;

public import core.lifetime : _d_delstruct;

public import core.internal.dassert: _d_assert_fail;

public import core.internal.destruction: __ArrayDtor;
Expand Down