Skip to content

std.typecons: Make RefCounted pure nothrow @nogc when possible #4832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andralex merged 1 commit into from
Feb 1, 2017
Merged

std.typecons: Make RefCounted pure nothrow @nogc when possible #4832

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 31 additions & 18 deletions std/typecons.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5082,9 +5082,17 @@ struct RefCounted(T, RefCountedAutoInitialize autoInit =
RefCountedAutoInitialize.yes)
if (!is(T == class) && !(is(T == interface)))
{
extern(C) private pure nothrow @nogc static // TODO remove pure when https://issues.dlang.org/show_bug.cgi?id=15862 has been fixed
{
pragma(mangle, "free") void pureFree( void *ptr );
pragma(mangle, "gc_addRange") void pureGcAddRange( in void* p, size_t sz, const TypeInfo ti = null );
pragma(mangle, "gc_removeRange") void pureGcRemoveRange( in void* p );
}

/// $(D RefCounted) storage implementation.
struct RefCountedStore
{
import core.memory : pureMalloc;
private struct Impl
{
T _payload;
Expand All @@ -5096,31 +5104,27 @@ if (!is(T == class) && !(is(T == interface)))
private void initialize(A...)(auto ref A args)
{
import core.exception : onOutOfMemoryError;
import core.memory : GC;
import core.stdc.stdlib : malloc;
import std.conv : emplace;

_store = cast(Impl*)malloc(Impl.sizeof);
_store = cast(Impl*)pureMalloc(Impl.sizeof);
if (_store is null)
onOutOfMemoryError();
static if (hasIndirections!T)
GC.addRange(&_store._payload, T.sizeof);
pureGcAddRange(&_store._payload, T.sizeof);
emplace(&_store._payload, args);
_store._count = 1;
}

private void move(ref T source)
{
import core.exception : onOutOfMemoryError;
import core.memory : GC;
import core.stdc.stdlib : malloc;
import core.stdc.string : memcpy, memset;

_store = cast(Impl*)malloc(Impl.sizeof);
_store = cast(Impl*)pureMalloc(Impl.sizeof);
if (_store is null)
onOutOfMemoryError();
static if (hasIndirections!T)
GC.addRange(&_store._payload, T.sizeof);
pureGcAddRange(&_store._payload, T.sizeof);

// Can't use std.algorithm.move(source, _store._payload)
// here because it requires the target to be initialized.
Expand Down Expand Up @@ -5233,11 +5237,10 @@ to deallocate the corresponding resource.
.destroy(_refCounted._store._payload);
static if (hasIndirections!T)
{
import core.memory : GC;
GC.removeRange(&_refCounted._store._payload);
pureGcRemoveRange(&_refCounted._store._payload);
}
import core.stdc.stdlib : free;
free(_refCounted._store);

pureFree(_refCounted._store);
_refCounted._store = null;
}

Expand Down Expand Up @@ -5322,7 +5325,7 @@ assert(refCountedStore.isInitialized)).
}

///
@system unittest
pure @system nothrow @nogc unittest
{
// A pair of an $(D int) and a $(D size_t) - the latter being the
// reference count - will be dynamically allocated
Expand All @@ -5336,7 +5339,7 @@ assert(refCountedStore.isInitialized)).
// the pair will be freed when rc1 and rc2 go out of scope
}

@system unittest
pure @system unittest
{
RefCounted!int* p;
{
Expand Down Expand Up @@ -5375,7 +5378,7 @@ assert(refCountedStore.isInitialized)).
assert(a.x._refCounted._store._count == 2, "BUG 4356 still unfixed");
}

@system unittest
pure @system nothrow @nogc unittest
{
import std.algorithm.mutation : swap;

Expand All @@ -5384,7 +5387,7 @@ assert(refCountedStore.isInitialized)).
}

// 6606
@safe unittest
@safe pure nothrow @nogc unittest
{
union U {
size_t i;
Expand All @@ -5399,7 +5402,7 @@ assert(refCountedStore.isInitialized)).
}

// 6436
@system unittest
@system pure unittest
{
struct S { this(ref int val) { assert(val == 3); ++val; } }

Expand All @@ -5408,7 +5411,15 @@ assert(refCountedStore.isInitialized)).
assert(val == 4);
}

@system unittest
// gc_addRange coverage
@system pure unittest
{
struct S { int* p; }

auto s = RefCounted!S(null);
Copy link
Contributor Author

@nordlow nordlow Jan 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes line 5003 covered.

}

@system pure nothrow @nogc unittest
{
RefCounted!int a;
a = 5; //This should not assert
Expand All @@ -5417,6 +5428,8 @@ assert(refCountedStore.isInitialized)).
RefCounted!int b;
b = a; //This should not assert either
assert(b == 5);

RefCounted!(int*) c;
}

/**
Expand Down