Skip to content

Fix issue 18084 - tempCString type should not change size when used in unittests. #5932

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

Merged
andralex merged 1 commit into from
Dec 20, 2017
Merged

Fix issue 18084 - tempCString type should not change size when used in unittests. #5932

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
11 changes: 7 additions & 4 deletions std/internal/cstring.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,17 +218,20 @@ private:

To* _ptr;
size_t _length; // length of the string

// the 'small string optimization'
version (unittest)
{
enum buffLength = 16 / To.sizeof; // smaller size to trigger reallocations
// smaller size to trigger reallocations. Padding is to account for
// unittest/non-unittest cross-compilation (to avoid corruption)
To[16 / To.sizeof] _buff;
To[(256 - 16) / To.sizeof] _unittest_pad;
}
else
{
enum buffLength = 256 / To.sizeof; // production size
To[256 / To.sizeof] _buff; // production size
}

To[buffLength] _buff; // the 'small string optimization'

static TempCStringBuffer trustedVoidInit() { TempCStringBuffer res = void; return res; }
}

Expand Down