Skip to content

Fix indexed ndslice increment and decrement safety checks on GDC #484

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

Open
jmh530 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix indexed ndslice increment and decrement safety checks on GDC #484

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
25 changes: 22 additions & 3 deletions source/mir/ndslice/slice.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3323,10 +3323,10 @@ public:
// @@@workaround@@@ for Issue 16473
//if (op == `++` || op == `--`)
{
// check op safety
static auto ref fun(DeepElement t) @safe
// Check op safety without returning a reference to the local value.
static void fun(DeepElement t) @safe
{
return mixin(op ~ `t`);
cast(void) mixin(op ~ `t`);
}
return mixin (op ~ `_iterator[indexStride(_indices)]`);
}
Expand All @@ -3342,6 +3342,25 @@ public:
assert(a[1, 2] == 1);
}

// https://github.com/libmir/mir-algorithm/issues/483
// Check that indexed increment and decrement compile for narrow integers
// with optimized GDC and -Werror, and still return the cell by reference.
static if (doUnittest)
@safe pure nothrow @nogc version(mir_ndslice_test) unittest
{
import std.meta: AliasSeq;
static foreach (T; AliasSeq!(ubyte, ushort, uint, ulong))
{{
T[6] data;
auto a = data[].sliced(2, 3);
assert(++a[1, 2] == 1);
assert(data[5] == 1);
assert(--a[1, 2] == 0);
(++a[1, 2]) = T(7);
assert(data[5] == 7 && a[0, 0] == 0);
}}
}

// Issue 16473
static if (doUnittest)
@safe pure nothrow version(mir_ndslice_test) unittest
Expand Down
Loading