---

yaml
---
r: 135229
b: refs/heads/snap-stage3
c: 7409050
h: refs/heads/master
i:
  135227: 18da618
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 74090504219e4e37c1a6d9fdd8600f44b51c7b04
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1c36d1c71d0095d822ab03e7615fffc63fb16988
+refs/heads/snap-stage3: 74090504219e4e37c1a6d9fdd8600f44b51c7b04
 refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/realloc-16687.rs

@@ -56,6 +56,13 @@ unsafe fn test_triangle() -> bool {
 
         ret
     }
+    unsafe fn deallocate(ptr: *mut u8, size: uint, align: uint) {
+        if PRINT { println!("deallocate(ptr=0x{:010x} size={:u} align={:u})",
+                            ptr as uint, size, align);
+        }
+
+        heap::deallocate(ptr, size, align);
+    }
     unsafe fn reallocate(ptr: *mut u8, size: uint, align: uint,
                              old_size: uint) -> *mut u8 {
         if PRINT {
@@ -95,10 +102,16 @@ unsafe fn test_triangle() -> bool {
     }
 
     sanity_check(ascend.as_slice());
-    test_1(ascend);
-    test_2(ascend);
-    test_3(ascend);
-    test_4(ascend);
+    test_1(ascend); // triangle -> square
+    test_2(ascend); // square -> triangle
+    test_3(ascend); // triangle -> square
+    test_4(ascend); // square -> triangle
+
+    for i in range(0u, COUNT / 2) {
+        let size = idx_to_size(i);
+        deallocate(ascend[2*i], size, ALIGN);
+        deallocate(ascend[2*i+1], size, ALIGN);
+    }
 
     return true;