mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-01 23:50:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3171 from MartinNowak/refCounted

Browse source 
fix Issue 14432 - move construction for RefCounted
This commit is contained in:
JakobOvrum 2015-04-20 22:44:18 +09:00
commit f7498ad8ec
2 changed files with 120 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

49
std/algorithm/mutation.d
View file

@ -833,7 +833,7 @@ Params:
*/
void move(T)(ref T source, ref T target)
{
import core.stdc.string : memcpy;
import core.stdc.string : memcpy, memset;
import std.traits : hasAliasing, hasElaborateAssign,
hasElaborateCopyConstructor, hasElaborateDestructor,
isAssignable;
@ -860,19 +860,17 @@ void move(T)(ref T source, ref T target)
// object in order to avoid double freeing and undue aliasing
static if (hasElaborateDestructor!T || hasElaborateCopyConstructor!T)
{
import std.algorithm.searching : endsWith;
static T empty;
static if (T.tupleof.length > 0 &&
T.tupleof[$-1].stringof.endsWith("this"))
{
// If T is nested struct, keep original context pointer
memcpy(&source, &empty, T.sizeof - (void*).sizeof);
}
// If T is nested struct, keep original context pointer
static if (__traits(isNested, T))
enum sz = T.sizeof - (void*).sizeof;
else
{
memcpy(&source, &empty, T.sizeof);
}
enum sz = T.sizeof;
auto init = typeid(T).init();
if (init.ptr is null) // null ptr means initialize to 0s
memset(&source, 0, sz);
else
memcpy(&source, init.ptr, sz);
}
}
else
@ -992,7 +990,7 @@ unittest
/// Ditto
T move(T)(ref T source)
{
import core.stdc.string : memcpy;
import core.stdc.string : memcpy, memset;
import std.traits : hasAliasing, hasElaborateAssign,
hasElaborateCopyConstructor, hasElaborateDestructor,
isAssignable;
@ -1016,19 +1014,17 @@ T move(T)(ref T source)
// object in order to avoid double freeing and undue aliasing
static if (hasElaborateDestructor!T || hasElaborateCopyConstructor!T)
{
import std.algorithm.searching : endsWith;
static T empty;
static if (T.tupleof.length > 0 &&
T.tupleof[$-1].stringof.endsWith("this"))
{
// If T is nested struct, keep original context pointer
memcpy(&source, &empty, T.sizeof - (void*).sizeof);
}
// If T is nested struct, keep original context pointer
static if (__traits(isNested, T))
enum sz = T.sizeof - (void*).sizeof;
else
{
memcpy(&source, &empty, T.sizeof);
}
enum sz = T.sizeof;
auto init = typeid(T).init();
if (init.ptr is null) // null ptr means initialize to 0s
memset(&source, 0, sz);
else
memcpy(&source, init.ptr, sz);
}
}
else
@ -2255,4 +2251,3 @@ void uninitializedFill(Range, Value)(Range range, Value value)
// Doesn't matter whether fill is initialized or not
return fill(range, value);
}