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

Fix bugzilla issue 24809: In some cases, stable sort assigns to unininitialized elements (#9057)

Browse source
This commit is contained in:
Jonathan M Davis 2024-10-17 21:00:02 -06:00 • committed by Martin Kinkelin
parent 9e78de4d86
commit ef6a991534
1 changed files with 71 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

73
std/algorithm/sorting.d
View file

@ -2625,11 +2625,21 @@ private template TimSortImpl(alias pred, R)
// can't use `temp.length` if there's no default constructor
static if (__traits(compiles, { T defaultConstructed; cast(void) defaultConstructed; }))
{
if (__ctfe) temp.length = newSize;
else temp = () @trusted { return uninitializedArray!(T[])(newSize); }();
static if (hasElaborateAssign!T)
temp.length = newSize;
else
{
if (__ctfe) temp.length = newSize;
else temp = () @trusted { return uninitializedArray!(T[])(newSize); }();
}
}
else
{
static assert(!hasElaborateAssign!T,
"Structs which have opAssign but cannot be default-initialized " ~
"do not currently work with stable sort: " ~
"https://issues.dlang.org/show_bug.cgi?id=24810");
temp = () @trusted { return uninitializedArray!(T[])(newSize); }();
}
}
@ -3093,6 +3103,65 @@ private template TimSortImpl(alias pred, R)
array.sort!((a, b) => false, SwapStrategy.stable);
}
// https://issues.dlang.org/show_bug.cgi?id=24809
@safe unittest
{
static struct E
{
int value;
int valid = 42;
~this()
{
assert(valid == 42);
}
}
import std.array : array;
import std.range : chain, only, repeat;
auto arr = chain(repeat(E(41), 18),
only(E(39)),
repeat(E(41), 16),
only(E(1)),
repeat(E(42), 33),
only(E(33)),
repeat(E(42), 16),
repeat(E(43), 27),
only(E(33)),
repeat(E(43), 34),
only(E(34)),
only(E(43)),
only(E(63)),
repeat(E(44), 42),
only(E(27)),
repeat(E(44), 11),
repeat(E(45), 64),
repeat(E(46), 3),
only(E(11)),
repeat(E(46), 7),
only(E(4)),
repeat(E(46), 34),
only(E(36)),
repeat(E(46), 17),
repeat(E(47), 36),
only(E(39)),
repeat(E(47), 26),
repeat(E(48), 17),
only(E(21)),
repeat(E(48), 5),
only(E(39)),
repeat(E(48), 14),
only(E(58)),
repeat(E(48), 24),
repeat(E(49), 13),
only(E(40)),
repeat(E(49), 38),
only(E(18)),
repeat(E(49), 11),
repeat(E(50), 6)).array();
arr.sort!((a, b) => a.value < b.value, SwapStrategy.stable)();
}
// schwartzSort
/**