---

yaml
---
r: 13052
b: refs/heads/master
c: d89b4c8
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 174f789e0b98cc98d4ba08076c61ef7a4b03a687
+refs/heads/master: d89b4c8c61b4995559c2e5b963d58b5dd599fdf3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/arc.rs

@@ -19,15 +19,17 @@ type arc_data<T> = {
     data: T
 };
 
-resource arc_destruct<T>(data: *arc_data<T>) {
+resource arc_destruct<T>(data: *libc::c_void) {
     unsafe {
-        let ptr = &mut (*data).count;
+        let data: ~arc_data<T> = unsafe::reinterpret_cast(data);
+        let ref_ptr = &mut data.count;
 
-        let new_count = rustrt::rust_atomic_decrement(ptr);
+        let new_count = rustrt::rust_atomic_decrement(ref_ptr);
         assert new_count >= 0;
         if new_count == 0 {
-            let _ptr : ~arc_data<T> = unsafe::reinterpret_cast(data);
             // drop glue takes over.
+        } else {
+            unsafe::forget(data);
         }
     }
 }
@@ -48,7 +50,11 @@ fn arc<T>(-data: T) -> arc<T> {
  wrapper."]
 fn get<T>(rc: &a.arc<T>) -> &a.T {
     unsafe {
-        &(***rc).data
+        let ptr: ~arc_data<T> = unsafe::reinterpret_cast(**rc);
+        // Cast us back into the correct region
+        let r = unsafe::reinterpret_cast(&ptr.data);
+        unsafe::forget(ptr);
+        ret r;
     }
 }
 
@@ -58,9 +64,10 @@ The resulting two `arc` objects will point to the same underlying data
 object. However, one of the `arc` objects can be sent to another task,
 allowing them to share the underlying data."]
 fn clone<T>(rc: &arc<T>) -> arc<T> {
-    let data = **rc;
     unsafe {
-        rustrt::rust_atomic_increment(&mut (*data).count);
+        let ptr: ~arc_data<T> = unsafe::reinterpret_cast(**rc);
+        rustrt::rust_atomic_increment(&mut ptr.count);
+        unsafe::forget(ptr);
     }
     arc_destruct(**rc)
 }