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

fix Issue 8171 - Broken std.algorithm.move for nested struct has no member

Browse source
This commit is contained in:
k-hara 2012-05-31 10:35:45 +09:00
parent c164f04018
commit 1bd9b79e84
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
std/algorithm.d
View file

@ -1352,7 +1352,8 @@ void move(T)(ref T source, ref T target)
static if (hasElaborateDestructor!T || hasElaborateCopyConstructor!T) static if (hasElaborateDestructor!T || hasElaborateCopyConstructor!T)
{ {
static T empty; static T empty;
static if (T.tupleof[$-1].stringof.endsWith("this")) static if (T.tupleof.length > 0 &&
T.tupleof[$-1].stringof.endsWith("this"))
{ {
// If T is nested struct, keep original context pointer // If T is nested struct, keep original context pointer
memcpy(&source, &empty, T.sizeof - (void*).sizeof); memcpy(&source, &empty, T.sizeof - (void*).sizeof);
@ -1443,7 +1444,8 @@ T move(T)(ref T source)
static if (hasElaborateDestructor!T || hasElaborateCopyConstructor!T) static if (hasElaborateDestructor!T || hasElaborateCopyConstructor!T)
{ {
static T empty; static T empty;
static if (T.tupleof[$-1].stringof.endsWith("this")) static if (T.tupleof.length > 0 &&
T.tupleof[$-1].stringof.endsWith("this"))
{ {
// If T is nested struct, keep original context pointer // If T is nested struct, keep original context pointer
memcpy(&source, &empty, T.sizeof - (void*).sizeof); memcpy(&source, &empty, T.sizeof - (void*).sizeof);
@ -1557,6 +1559,19 @@ unittest// Issue 8057
a.x = 1; a.x = 1;
auto b = foo(a); auto b = foo(a);
assert(b.x == 1); assert(b.x == 1);
// Regression 8171
static struct Array(T)
{
// nested struct has no member
struct Payload
{
~this() {}
}
}
Array!int.Payload x = void;
static assert(__traits(compiles, move(x) ));
static assert(__traits(compiles, move(x, x) ));
} }
// moveAll // moveAll