32 changes: 16 additions & 16 deletions src/rt/lifetime.d
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extern (C) Object _d_newclass(const ClassInfo ci)
* function called by Release() when Release()'s reference count goes
* to zero.
*/
p = malloc(ci.init.length);
p = malloc(ci.initializer.length);
if (!p)
onOutOfMemoryError();
}
Expand All @@ -93,26 +93,26 @@ extern (C) Object _d_newclass(const ClassInfo ci)
attr |= BlkAttr.FINALIZE;
if (ci.m_flags & TypeInfo_Class.ClassFlags.noPointers)
attr |= BlkAttr.NO_SCAN;
p = GC.malloc(ci.init.length, attr, ci);
p = GC.malloc(ci.initializer.length, attr, ci);
debug(PRINTF) printf(" p = %p\n", p);
}

debug(PRINTF)
{
printf("p = %p\n", p);
printf("ci = %p, ci.init.ptr = %p, len = %llu\n", ci, ci.init.ptr, cast(ulong)ci.init.length);
printf("vptr = %p\n", *cast(void**) ci.init);
printf("vtbl[0] = %p\n", (*cast(void***) ci.init)[0]);
printf("vtbl[1] = %p\n", (*cast(void***) ci.init)[1]);
printf("init[0] = %x\n", (cast(uint*) ci.init)[0]);
printf("init[1] = %x\n", (cast(uint*) ci.init)[1]);
printf("init[2] = %x\n", (cast(uint*) ci.init)[2]);
printf("init[3] = %x\n", (cast(uint*) ci.init)[3]);
printf("init[4] = %x\n", (cast(uint*) ci.init)[4]);
printf("ci = %p, ci.init.ptr = %p, len = %llu\n", ci, ci.initializer.ptr, cast(ulong)ci.initializer.length);
printf("vptr = %p\n", *cast(void**) ci.initializer);
printf("vtbl[0] = %p\n", (*cast(void***) ci.initializer)[0]);
printf("vtbl[1] = %p\n", (*cast(void***) ci.initializer)[1]);
printf("init[0] = %x\n", (cast(uint*) ci.initializer)[0]);
printf("init[1] = %x\n", (cast(uint*) ci.initializer)[1]);
printf("init[2] = %x\n", (cast(uint*) ci.initializer)[2]);
printf("init[3] = %x\n", (cast(uint*) ci.initializer)[3]);
printf("init[4] = %x\n", (cast(uint*) ci.initializer)[4]);
}

// initialize it
p[0 .. ci.init.length] = ci.init[];
p[0 .. ci.initializer.length] = ci.initializer[];

debug(PRINTF) printf("initialization done\n");
return cast(Object) p;
Expand Down Expand Up @@ -959,7 +959,7 @@ extern (C) void[] _d_newarrayiT(const TypeInfo ti, size_t length) pure nothrow
auto tinext = unqualify(ti.next);
auto size = tinext.tsize;

auto init = tinext.init();
auto init = tinext.initializer();

switch (init.length)
{
Expand Down Expand Up @@ -1087,7 +1087,7 @@ extern (C) void* _d_newitemT(in TypeInfo _ti)
extern (C) void* _d_newitemiT(in TypeInfo _ti)
{
auto p = _d_newitemU(_ti);
auto init = _ti.init();
auto init = _ti.initializer();
assert(init.length <= _ti.tsize);
memcpy(p, init.ptr, init.length);
return p;
Expand Down Expand Up @@ -1376,7 +1376,7 @@ extern (C) void rt_finalize2(void* p, bool det = true, bool resetMemory = true)

if (resetMemory)
{
auto w = (*pc).init;
auto w = (*pc).initializer;
p[0 .. w.length] = w[];
}
}
Expand Down Expand Up @@ -1604,7 +1604,7 @@ body
void* newdata;
auto tinext = unqualify(ti.next);
auto sizeelem = tinext.tsize;
auto initializer = tinext.init();
auto initializer = tinext.initializer();
auto initsize = initializer.length;

assert(sizeelem);
Expand Down
2 changes: 1 addition & 1 deletion src/rt/sections_elf_shared.d
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ extern(C) void _d_dso_registry(CompilerDSOData* data)
if (firstDSO) initLocks();

DSO* pdso = cast(DSO*).calloc(1, DSO.sizeof);
assert(typeid(DSO).init().ptr is null);
assert(typeid(DSO).initializer().ptr is null);
*data._slot = pdso; // store backlink in library record

pdso._moduleGroup = ModuleGroup(toRange(data._minfo_beg, data._minfo_end));
Expand Down
2 changes: 1 addition & 1 deletion src/rt/tracegc.d
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extern (C) Object _d_newclassTrace(string file, int line, string funcname, const
funcname.length, funcname.ptr
);
}
accumulate(file, line, funcname, ci.name, ci.init.length);
accumulate(file, line, funcname, ci.name, ci.initializer.length);
return _d_newclass(ci);
}

Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_C.d
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TypeInfo_C : TypeInfo
return Object.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. Object.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_byte.d
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TypeInfo_g : TypeInfo
return byte.sizeof;
}

override const(void)[] init() @trusted
override const(void)[] initializer() @trusted
{
return (cast(void *)null)[0 .. byte.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_cdouble.d
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypeInfo_r : TypeInfo
*cast(F*)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable F r;
return (&r)[0 .. 1];
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_cent.d
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class TypeInfo_zi : TypeInfo
return cent.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. cent.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_cfloat.d
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypeInfo_q : TypeInfo
*cast(F*)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable F r;
return (&r)[0 .. 1];
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_char.d
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TypeInfo_a : TypeInfo
*cast(char *)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable char c;

Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_creal.d
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypeInfo_c : TypeInfo
*cast(F*)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable F r;
return (&r)[0 .. 1];
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_dchar.d
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TypeInfo_w : TypeInfo
*cast(dchar *)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable dchar c;

Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_delegate.d
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TypeInfo_D : TypeInfo
*cast(dg *)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable dg d;

Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_double.d
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypeInfo_d : TypeInfo
*cast(F*)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable F r;
return (&r)[0 .. 1];
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_float.d
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypeInfo_f : TypeInfo
*cast(F*)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable F r;
return (&r)[0 .. 1];
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_int.d
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class TypeInfo_i : TypeInfo
return int.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. int.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_long.d
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TypeInfo_l : TypeInfo
return long.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. long.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_ptr.d
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class TypeInfo_P : TypeInfo
return (void*).sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. (void*).sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_real.d
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class TypeInfo_e : TypeInfo
*cast(F*)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable F r;
return (&r)[0 .. 1];
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_short.d
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TypeInfo_s : TypeInfo
return short.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. short.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_ubyte.d
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TypeInfo_h : TypeInfo
return ubyte.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. ubyte.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_ucent.d
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class TypeInfo_zk : TypeInfo
return ucent.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. ucent.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_uint.d
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class TypeInfo_k : TypeInfo
return uint.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. uint.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_ulong.d
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TypeInfo_m : TypeInfo
return ulong.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. ulong.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_ushort.d
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TypeInfo_t : TypeInfo
return ushort.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. ushort.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_void.d
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TypeInfo_v : TypeInfo
return void.sizeof;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
return (cast(void *)null)[0 .. void.sizeof];
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/typeinfo/ti_wchar.d
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TypeInfo_u : TypeInfo
*cast(wchar *)p2 = t;
}

override const(void)[] init() const @trusted
override const(void)[] initializer() const @trusted
{
static immutable wchar c;

Expand Down
2 changes: 1 addition & 1 deletion src/rt/util/container/common.d
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void destroy(T)(ref T t) if (!is(T == struct))
void initialize(T)(ref T t) if (is(T == struct))
{
import core.stdc.string;
if(auto p = typeid(T).init().ptr)
if(auto p = typeid(T).initializer().ptr)
memcpy(&t, p, T.sizeof);
else
memset(&t, 0, T.sizeof);
Expand Down