d: Merge upstream dmd, druntime 09faa4eacd, phobos 13ef27a56.

[thirdparty/gcc.git] / libphobos / src / std / typecons.d

diff --git a/libphobos/src/std/typecons.d b/libphobos/src/std/typecons.d
index e83b6171334d6c266b7affddeab1eeedc335ff67..25cf9e0084134f9824393067cd0bffbd5b588ec9 100644 (file)
--- a/libphobos/src/std/typecons.d
+++ b/libphobos/src/std/typecons.d
@@ -225,7 +225,10 @@ public:
     {
         if (_p !is null)
         {
-            destroy(_p);
+            static if (is(T == class) || is(T == interface))
+                destroy(_p);
+            else
+                destroy(*_p);
             _p = null;
         }
     }
@@ -259,7 +262,7 @@ private:
 ///
 @safe unittest
 {
-    static struct S
+    struct S
     {
         int i;
         this(int i){this.i = i;}
@@ -284,6 +287,7 @@ private:
     Unique!S u1;
     assert(u1.isEmpty);
     u1 = produce();
+    assert(u1.i == 5);
     increment(u1);
     assert(u1.i == 6);
     //consume(u1); // Error: u1 is not copyable
@@ -292,6 +296,24 @@ private:
     assert(u1.isEmpty);
 }
 
+@safe unittest
+{
+    int i;
+    struct S
+    {
+        ~this()
+        {
+            // check context pointer still exists - dtor also called before GC frees struct
+            if (this.tupleof[0])
+                i++;
+        }
+    }
+    {
+        Unique!S u = new S;
+    }
+    assert(i == 1);
+}
+
 @system unittest
 {
     // test conversion to base ref