traits for opPostMove needed a different approach.

dlang · Nov 17, 2024 · feabd4d · feabd4d
1 parent 044da06
commit feabd4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/druntime/src/core/internal/moving.d b/druntime/src/core/internal/moving.d
@@ -40,9 +40,10 @@ void __move_post_blt(S)(ref S newLocation, ref S oldLocation) nothrow
 
     static if (__traits(hasMember, S, "opPostMove"))
     {
-        import core.internal.traits : lvalueOf, rvalueOf;
-        static assert( is(typeof(S.init.opPostMove(lvalueOf!S))) &&
-                      !is(typeof(S.init.opPostMove(rvalueOf!S))),
+        import core.internal.traits : Parameters;
+        static assert(Parameters!(S.init.opPostMove).length == 1 &&
+                      is(Parameters!(S.init.opPostMove)[0] : const S) &&
+                      __traits(getParameterStorageClasses, S.init.opPostMove, 0)[0] == "ref",
                 "`" ~ S.stringof ~ ".opPostMove` must take exactly one argument of type `" ~ S.stringof ~ "` by reference");
 
         newLocation.opPostMove(oldLocation);

diff --git a/druntime/src/core/internal/traits.d b/druntime/src/core/internal/traits.d
@@ -248,8 +248,10 @@ template hasElaborateMove(S)
     }
     else static if (is(S == struct))
     {
-        enum hasElaborateMove = (is(typeof(S.init.opPostMove(lvalueOf!S))) &&
-                                    !is(typeof(S.init.opPostMove(rvalueOf!S)))) ||
+        enum hasElaborateMove = (is(typeof(S.init.opPostMove)) &&
+                                 Parameters!(S.init.opPostMove).length == 1 &&
+                                 is(Parameters!(S.init.opPostMove)[0] : const S) &&
+                                 __traits(getParameterStorageClasses, S.init.opPostMove, 0)[0] == "ref") ||
                                 anySatisfy!(.hasElaborateMove, Fields!S);
     }
     else