Merge remote-tracking branch 'upstream/stable' into merge_stable

Author: MartinNowak

changelog/lazy-gc-init.dd

@@ -1,3 +1,3 @@
-the garbage collector is now lazily initialized on first use
+The garbage collector is now lazily initialized on first use
 
 The runtime now lazily initializes the GC on first use, thus allowing applications that do not use the GC to skip its initialization.

src/core/memory.d

@@ -1010,14 +1010,16 @@ void __delete(T)(ref T x) @system
         static assert(0, "It is not possible to delete: `" ~ T.stringof ~ "`");
     }
 
-    static if (is(T == interface) || is(T == class))
+    static if (is(T == interface) ||
+              is(T == class) ||
+              is(T == U2*, U2))
     {
         GC.free(cast(void*) x);
         x = null;
     }
-    else static if (is(T == U2*, U2) || is(T : E2[], E2))
+    else static if (is(T : E2[], E2))
     {
-        GC.free(&x);
+        GC.free(x.ptr);
         x = null;
     }
 }
@@ -1151,4 +1153,17 @@ unittest
 {
     Object x = null;
     __delete(x);
+
+    struct S { ~this() { } }
+    class C { }
+    interface I { }
+
+    int[] a; __delete(a);
+    S[] as; __delete(as);
+    C c; __delete(c);
+    I i; __delete(i);
+    C* pc = &c; __delete(*pc);
+    I* pi = &i; __delete(*pi);
+    int* pint; __delete(pint);
+    S* ps; __delete(ps);
 }

src/core/sys/posix/sys/shm.d

@@ -156,6 +156,32 @@ else version(NetBSD)
     int   shmdt(in void*);
     int   shmget(key_t, size_t, int);
 }
+else version(DragonFlyBSD)
+{
+    enum SHM_RDONLY     = 0x01000; // 010000
+    enum SHM_RND        = 0x02000; // 020000
+    enum SHMLBA         = 1 << 12; // PAGE_SIZE = (1<<PAGE_SHIFT)
+
+    alias c_ulong   shmatt_t;
+
+    struct shmid_ds
+    {
+         ipc_perm       shm_perm;
+         int            shm_segsz;
+         pid_t          shm_lpid;
+         pid_t          shm_cpid;
+         short          shm_nattch;
+         time_t         shm_atime;
+         time_t         shm_dtime;
+         time_t         shm_ctime;
+         private void*  shm_internal;
+    }
+
+    void* shmat(int, in void*, int);
+    int   shmctl(int, int, shmid_ds*);
+    int   shmdt(in void*);
+    int   shmget(key_t, size_t, int);
+}
 else version( Darwin )
 {