Merge remote-tracking branch 'upstream/stable'

dlang · Apr 20, 2015 · 7331dc3 · 7331dc3
2 parents e8aa524 + eeb01a6
commit 7331dc3
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/gc/gc.d b/src/gc/gc.d
@@ -3172,6 +3172,7 @@ struct SmallObjectPool
 
         info.base = cast(void*)((cast(size_t)p) & notbinsize[bin]);
         info.size = binsize[bin];
+        offset = info.base - baseAddr;
         info.attr = getBits(cast(size_t)(offset >> shiftBy));
 
         return info;
@@ -3259,6 +3260,14 @@ struct SmallObjectPool
     }
 }
 
+unittest // bugzilla 14467
+{
+    int[] arr = new int[10];
+    assert(arr.capacity);
+    arr = arr[$..$];
+    assert(arr.capacity);
+}
+
 /* ============================ SENTINEL =============================== */