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

add return scope to realloc

Browse source
This commit is contained in:
dkorpel 2021-05-29 14:18:15 +02:00 • committed by The Dlang Bot
parent 4d6254fbb3
commit 5242beb167
3 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
std/internal/cstring.d
View file

@ -145,7 +145,10 @@ if (isSomeChar!To && (isInputRange!From || isSomeString!From) &&
{
if (i + 1 == p.length)
{
heapBuffer = trustedRealloc(p, strLength, heapBuffer is null);
if (heapBuffer is null)
heapBuffer = trustedReallocStack(p, strLength);
else
heapBuffer = trustedRealloc(heapBuffer);
p = heapBuffer;
}
p[i++] = c;
@ -269,38 +272,41 @@ private:
static TempCStringBuffer trustedVoidInit() { TempCStringBuffer res = void; return res; }
}
private To[] trustedRealloc(To)(scope To[] buf, size_t strLength, bool bufIsOnStack)
private To[] trustedRealloc(To)(return scope To[] buf)
@trusted @nogc pure nothrow
{
pragma(inline, false); // because it's rarely called
import std.internal.memory : enforceRealloc;
const size_t newlen = buf.length * 3 / 2;
if (buf.length >= size_t.max / (2 * To.sizeof))
{
version (D_Exceptions)
{
import core.exception : onOutOfMemoryError;
onOutOfMemoryError();
}
else
{
assert(0, "Memory allocation failed");
}
}
auto ptr = cast(To*) enforceRealloc(buf.ptr, newlen * To.sizeof);
return ptr[0 .. newlen];
}
private To[] trustedReallocStack(To)(scope To[] buf, size_t strLength)
@trusted @nogc pure nothrow
{
pragma(inline, false); // because it's rarely called
import std.internal.memory : enforceMalloc, enforceRealloc;
import std.internal.memory : enforceMalloc;
size_t newlen = buf.length * 3 / 2;
if (bufIsOnStack)
{
if (newlen <= strLength)
newlen = strLength + 1; // +1 for terminating 0
auto ptr = cast(To*) enforceMalloc(newlen * To.sizeof);
ptr[0 .. buf.length] = buf[];
return ptr[0 .. newlen];
}
else
{
if (buf.length >= size_t.max / (2 * To.sizeof))
{
version (D_Exceptions)
{
import core.exception : onOutOfMemoryError;
onOutOfMemoryError();
}
else
{
assert(0, "Memory allocation failed");
}
}
auto ptr = cast(To*) enforceRealloc(buf.ptr, newlen * To.sizeof);
return ptr[0 .. newlen];
}
if (newlen <= strLength)
newlen = strLength + 1; // +1 for terminating 0
auto ptr = cast(To*) enforceMalloc(newlen * To.sizeof);
ptr[0 .. buf.length] = buf[];
return ptr[0 .. newlen];
}

4
std/internal/memory.d
View file

@ -42,7 +42,7 @@ void* enforceCalloc()(size_t nmemb, size_t size) @nogc nothrow pure @safe
}
// ditto
void* enforceRealloc()(void* ptr, size_t size) @nogc nothrow pure @system
void* enforceRealloc()(return scope void* ptr, size_t size) @nogc nothrow pure @system
{
auto result = fakePureRealloc(ptr, size);
if (!result) mixin(allocationFailed);
@ -54,5 +54,5 @@ extern (C) @nogc nothrow pure private
{
pragma(mangle, "malloc") void* fakePureMalloc(size_t) @safe;
pragma(mangle, "calloc") void* fakePureCalloc(size_t nmemb, size_t size) @safe;
pragma(mangle, "realloc") void* fakePureRealloc(void* ptr, size_t size) @system;
pragma(mangle, "realloc") void* fakePureRealloc(return scope void* ptr, size_t size) @system;
}

2
std/uni/package.d
View file

@ -1819,7 +1819,7 @@ alias sharSwitchLowerBound = sharMethod!switchUniformLowerBound;
return ptr[0 .. size];
}
static T[] realloc(T)(scope T[] arr, size_t size) @trusted
static T[] realloc(T)(return scope T[] arr, size_t size) @trusted
{
import std.internal.memory : enforceRealloc;
if (!size)