Merge pull request #7122 from tchaloupka/systimelocalaliasing

Fix issue 20097 merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>
dlang · Aug 4, 2019 · 225a6af · 225a6af
2 parents f54c9fc + 267c2aa
commit 225a6af
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/std/concurrency.d b/std/concurrency.d
@@ -74,12 +74,16 @@ private
 {
     bool hasLocalAliasing(Types...)()
     {
+        import std.typecons : Rebindable;
+
         // Works around "statement is not reachable"
         bool doesIt = false;
         static foreach (T; Types)
         {
             static if (is(T == Tid))
             { /* Allowed */ }
+            else static if (is(T : Rebindable!R, R))
+                doesIt |= hasLocalAliasing!R;
             else static if (is(T == struct))
                 doesIt |= hasLocalAliasing!(typeof(T.tupleof));
             else
@@ -94,6 +98,14 @@ private
         static assert(!hasLocalAliasing!(Tid, Container, int));
     }
 
+    @safe unittest
+    {
+        /* Issue 20097 */
+        import std.datetime.systime : SysTime;
+        static struct Container { SysTime time; }
+        static assert(!hasLocalAliasing!(SysTime, Container));
+    }
+
     enum MsgType
     {
         standard,