Skip to content
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

[stable] Cherry-pick 2 master fixes #9076

Merged
merged 2 commits into from
Oct 28, 2024
Merged

[stable] Cherry-pick 2 master fixes #9076

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e78de4
Fix Bugzilla 24773: Don't invoke destructors on uninitialized element…
s-ludwig Sep 20, 2024
ef6a991
Fix bugzilla issue 24809: In some cases, stable sort assigns to unini…
jmdavis Oct 18, 2024
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
93 changes: 90 additions & 3 deletions std/algorithm/sorting.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2385,7 +2385,11 @@ private template TimSortImpl(alias pred, R)
size_t stackLen = 0;

// Allocate temporary memory if not provided by user
if (temp.length < minTemp) temp = () @trusted { return uninitializedArray!(T[])(minTemp); }();
if (temp.length < minTemp)
{
static if (hasElaborateAssign!T) temp = new T[](minTemp);
else temp = () @trusted { return uninitializedArray!(T[])(minTemp); }();
}

for (size_t i = 0; i < range.length; )
{
Expand Down Expand Up @@ -2621,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); }();
}
}
Expand Down Expand Up @@ -3076,6 +3090,79 @@ private template TimSortImpl(alias pred, R)
array.sort!("a < b", SwapStrategy.stable);
}

// https://issues.dlang.org/show_bug.cgi?id=24773
@safe unittest
{
static struct S
{
int i = 42;
~this() { assert(i == 42); }
}

auto array = new S[](400);
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
/**
Alternative sorting method that should be used when comparing keys involves an
Expand Down
Loading