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

Merge pull request #6811 from edi33416/issue_13300

Browse source 
Fix Issue 13300 - pure function 'std.array.Appender!(T[]).Appender.en…
This commit is contained in:
Sebastian Wilzbach 2018-12-23 11:23:05 +01:00 • committed by GitHub
commit c7106f02b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

51
std/array.d
View file

@ -3235,7 +3235,7 @@ if (isDynamicArray!A)
* Params: * Params:
* newCapacity = the capacity the `Appender` should have * newCapacity = the capacity the `Appender` should have
*/ */
void reserve(size_t newCapacity) @safe pure nothrow void reserve(size_t newCapacity)
{ {
if (_data) if (_data)
{ {
@ -3270,7 +3270,7 @@ if (isDynamicArray!A)
} }
// ensure we can add nelems elements, resizing as necessary // ensure we can add nelems elements, resizing as necessary
private void ensureAddable(size_t nelems) @trusted pure nothrow private void ensureAddable(size_t nelems)
{ {
if (!_data) if (!_data)
_data = new Data; _data = new Data;
@ -3306,7 +3306,7 @@ if (isDynamicArray!A)
// first, try extending the current block // first, try extending the current block
if (_data.canExtend) if (_data.canExtend)
{ {
immutable u = GC.extend(_data.arr.ptr, nelems * T.sizeof, (newlen - len) * T.sizeof); immutable u = (() @trusted => GC.extend(_data.arr.ptr, nelems * T.sizeof, (newlen - len) * T.sizeof))();
if (u) if (u)
{ {
// extend worked, update the capacity // extend worked, update the capacity
@ -3322,12 +3322,12 @@ if (isDynamicArray!A)
const nbytes = mulu(newlen, T.sizeof, overflow); const nbytes = mulu(newlen, T.sizeof, overflow);
if (overflow) assert(0); if (overflow) assert(0);
auto bi = GC.qalloc(nbytes, blockAttribute!T); auto bi = (() @trusted => GC.qalloc(nbytes, blockAttribute!T))();
_data.capacity = bi.size / T.sizeof; _data.capacity = bi.size / T.sizeof;
import core.stdc.string : memcpy; import core.stdc.string : memcpy;
if (len) if (len)
memcpy(bi.base, _data.arr.ptr, len * T.sizeof); () @trusted { memcpy(bi.base, _data.arr.ptr, len * T.sizeof); }();
_data.arr = (cast(Unqual!T*) bi.base)[0 .. len]; _data.arr = (() @trusted => (cast(Unqual!T*) bi.base)[0 .. len])();
_data.canExtend = true; _data.canExtend = true;
// leave the old data, for safety reasons // leave the old data, for safety reasons
} }
@ -3422,10 +3422,10 @@ if (isDynamicArray!A)
} }
// make sure we have enough space, then add the items // make sure we have enough space, then add the items
@trusted auto bigDataFun(size_t extra) auto bigDataFun(size_t extra)
{ {
ensureAddable(extra); ensureAddable(extra);
return _data.arr.ptr[0 .. _data.arr.length + extra]; return (() @trusted => _data.arr.ptr[0 .. _data.arr.length + extra])();
} }
auto bigData = bigDataFun(items.length); auto bigData = bigDataFun(items.length);
@ -3619,6 +3619,41 @@ if (isDynamicArray!A)
app.put(r[]); app.put(r[]);
} }
@safe unittest // issue 13300
{
static test(bool isPurePostblit)()
{
static if (!isPurePostblit)
static int i;
struct Simple
{
@disable this(); // Without this, it works.
static if (!isPurePostblit)
this(this) { i++; }
else
pure this(this) { }
private:
this(int tmp) { }
}
struct Range
{
@property Simple front() { return Simple(0); }
void popFront() { count++; }
@property empty() { return count < 3; }
size_t count;
}
Range r;
auto a = r.array();
}
static assert(__traits(compiles, () pure { test!true(); }));
static assert(!__traits(compiles, () pure { test!false(); }));
}
//Calculates an efficient growth scheme based on the old capacity //Calculates an efficient growth scheme based on the old capacity
//of data, and the minimum requested capacity. //of data, and the minimum requested capacity.
//arg curLen: The current length //arg curLen: The current length