Use new __traits(classInstanceAlignment)

dlang · May 13, 2022 · d5a101d · d5a101d
1 parent a37fd5f
commit d5a101d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/std/experimental/logger/core.d b/std/experimental/logger/core.d
@@ -1628,7 +1628,8 @@ private @property Logger defaultSharedLoggerImpl() @trusted
     import core.lifetime : emplace;
     import std.stdio : stderr;
 
-    __gshared align(FileLogger.alignof) void[__traits(classInstanceSize, FileLogger)] _buffer;
+    __gshared align(__traits(classInstanceAlignment, FileLogger))
+        void[__traits(classInstanceSize, FileLogger)] _buffer;
 
     import std.concurrency : initOnce;
     initOnce!stdSharedDefaultLogger({
@@ -1762,9 +1763,8 @@ private @property Logger stdThreadLocalLogImpl() @trusted
 {
     import core.lifetime : emplace;
 
-    static void*[(__traits(classInstanceSize, StdForwardLogger) - 1) / (void*).sizeof + 1] _buffer;
-
-    auto buffer = cast(ubyte[]) _buffer;
+    static align(__traits(classInstanceAlignment, StdForwardLogger))
+        void[__traits(classInstanceSize, StdForwardLogger)] buffer;
 
     if (stdLoggerDefaultThreadLogger is null)
     {

diff --git a/std/traits.d b/std/traits.d
@@ -4839,7 +4839,7 @@ Returns class instance alignment.
 template classInstanceAlignment(T)
 if (is(T == class))
 {
-    alias classInstanceAlignment = maxAlignment!(void*, typeof(T.tupleof));
+    enum classInstanceAlignment = __traits(classInstanceAlignment, T);
 }
 
 ///

diff --git a/std/typecons.d b/std/typecons.d
@@ -8267,7 +8267,7 @@ if (is(T == class))
 {
     // _d_newclass now use default GC alignment (looks like (void*).sizeof * 2 for
     // small objects). We will just use the maximum of filed alignments.
-    alias alignment = classInstanceAlignment!T;
+    enum alignment = __traits(classInstanceAlignment, T);
     alias aligned = _alignUp!alignment;
 
     static struct Scoped