---

yaml
---
r: 66233
b: refs/heads/master
c: 2afdf0d
h: refs/heads/master
i:
  66231: 1775615
v: v3

Author: Aatch

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 721164d5ec0c8b617bd72df36830fe1861e6362b
+refs/heads/master: 2afdf0d6a18bd0fb3369088eff1f8d9c707ad43d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libextra/rc.rs

@@ -70,12 +70,10 @@ impl<T> Rc<T> {
 impl<T> Drop for Rc<T> {
     fn finalize(&self) {
         unsafe {
-            if self.ptr.is_not_null() {
-                (*self.ptr).count -= 1;
-                if (*self.ptr).count == 0 {
-                    ptr::replace_ptr(self.ptr, intrinsics::uninit());
-                    free(self.ptr as *c_void)
-                }
+            (*self.ptr).count -= 1;
+            if (*self.ptr).count == 0 {
+                ptr::replace_ptr(self.ptr, intrinsics::uninit());
+                free(self.ptr as *c_void)
             }
         }
     }
@@ -222,12 +220,10 @@ impl<T> RcMut<T> {
 impl<T> Drop for RcMut<T> {
     fn finalize(&self) {
         unsafe {
-            if self.ptr.is_not_null() {
-                (*self.ptr).count -= 1;
-                if (*self.ptr).count == 0 {
-                    ptr::replace_ptr(self.ptr, uninit());
-                    free(self.ptr as *c_void)
-                }
+            (*self.ptr).count -= 1;
+            if (*self.ptr).count == 0 {
+                ptr::replace_ptr(self.ptr, uninit());
+                free(self.ptr as *c_void)
             }
         }
     }

trunk/src/librustc/middle/trans/adt.rs

@@ -135,7 +135,7 @@ fn represent_type_uncached(cx: &mut CrateContext, t: ty::t) -> Repr {
                 ty::lookup_field_type(cx.tcx, def_id, field.id, substs)
             };
             let packed = ty::lookup_packed(cx.tcx, def_id);
-            let dtor = ty::ty_dtor(cx.tcx, def_id).has_drop_flag();
+            let dtor = ty::ty_dtor(cx.tcx, def_id).is_present();
             let ftys =
                 if dtor { ftys + [ty::mk_bool()] } else { ftys };
             return Univariant(mk_struct(cx, ftys, packed), dtor)

trunk/src/librustc/middle/trans/glue.rs

@@ -406,8 +406,13 @@ pub fn make_free_glue(bcx: block, v: ValueRef, t: ty::t) {
     build_return(bcx);
 }
 
-pub fn trans_struct_drop_flag(bcx: block, t: ty::t, v0: ValueRef, dtor_did: ast::def_id,
-                              class_did: ast::def_id, substs: &ty::substs) -> block {
+pub fn trans_struct_drop(bcx: block,
+                         t: ty::t,
+                         v0: ValueRef,
+                         dtor_did: ast::def_id,
+                         class_did: ast::def_id,
+                         substs: &ty::substs)
+                      -> block {
     let repr = adt::represent_type(bcx.ccx(), t);
     let drop_flag = adt::trans_drop_flag_ptr(bcx, repr, v0);
     do with_cond(bcx, IsNotNull(bcx, Load(bcx, drop_flag))) |cx| {
@@ -449,43 +454,6 @@ pub fn trans_struct_drop_flag(bcx: block, t: ty::t, v0: ValueRef, dtor_did: ast:
     }
 }
 
-pub fn trans_struct_drop(mut bcx: block, t: ty::t, v0: ValueRef, dtor_did: ast::def_id,
-                         class_did: ast::def_id, substs: &ty::substs) -> block {
-    let repr = adt::represent_type(bcx.ccx(), t);
-
-    // Find and call the actual destructor
-    let dtor_addr = get_res_dtor(bcx.ccx(), dtor_did,
-                                 class_did, /*bad*/copy substs.tps);
-
-    // The second argument is the "self" argument for drop
-    let params = unsafe {
-        let ty = Type::from_ref(llvm::LLVMTypeOf(dtor_addr));
-        ty.element_type().func_params()
-    };
-
-    // Class dtors have no explicit args, so the params should
-    // just consist of the environment (self)
-    assert_eq!(params.len(), 1);
-
-    // Take a reference to the class (because it's using the Drop trait),
-    // do so now.
-    let llval = alloca(bcx, val_ty(v0));
-    Store(bcx, v0, llval);
-
-    let self_arg = PointerCast(bcx, llval, params[0]);
-    let args = ~[self_arg];
-
-    Call(bcx, dtor_addr, args);
-
-    // Drop the fields
-    let field_tys = ty::struct_fields(bcx.tcx(), class_did, substs);
-    for field_tys.iter().enumerate().advance |(i, fld)| {
-        let llfld_a = adt::trans_field_ptr(bcx, repr, v0, 0, i);
-        bcx = drop_ty(bcx, llfld_a, fld.mt.ty);
-    }
-
-    bcx
-}
 
 pub fn make_drop_glue(bcx: block, v0: ValueRef, t: ty::t) {
     // NB: v0 is an *alias* of type t here, not a direct value.
@@ -506,10 +474,7 @@ pub fn make_drop_glue(bcx: block, v0: ValueRef, t: ty::t) {
       ty::ty_struct(did, ref substs) => {
         let tcx = bcx.tcx();
         match ty::ty_dtor(tcx, did) {
-          ty::TraitDtor(dtor, true) => {
-            trans_struct_drop_flag(bcx, t, v0, dtor, did, substs)
-          }
-          ty::TraitDtor(dtor, false) => {
+          ty::TraitDtor(dtor) => {
             trans_struct_drop(bcx, t, v0, dtor, did, substs)
           }
           ty::NoDtor => {
@@ -629,23 +594,6 @@ pub fn make_take_glue(bcx: block, v: ValueRef, t: ty::t) {
       ty::ty_opaque_closure_ptr(ck) => {
         closure::make_opaque_cbox_take_glue(bcx, ck, v)
       }
-      ty::ty_struct(did, ref substs) => {
-        let tcx = bcx.tcx();
-        let bcx = iter_structural_ty(bcx, v, t, take_ty);
-
-        match ty::ty_dtor(tcx, did) {
-          ty::TraitDtor(dtor, false) => {
-            // Zero out the struct
-            unsafe {
-                let ty = Type::from_ref(llvm::LLVMTypeOf(v));
-                memzero(bcx, v, ty);
-            }
-
-          }
-          _ => { }
-        }
-        bcx
-      }
       _ if ty::type_is_structural(t) => {
         iter_structural_ty(bcx, v, t, take_ty)
       }

trunk/src/librustc/middle/ty.rs

@@ -3855,7 +3855,7 @@ pub fn item_path_str(cx: ctxt, id: ast::def_id) -> ~str {
 
 pub enum DtorKind {
     NoDtor,
-    TraitDtor(def_id, bool)
+    TraitDtor(def_id)
 }
 
 impl DtorKind {
@@ -3869,24 +3869,13 @@ impl DtorKind {
     pub fn is_present(&const self) -> bool {
         !self.is_not_present()
     }
-
-    pub fn has_drop_flag(&self) -> bool {
-        match self {
-            &NoDtor => false,
-            &TraitDtor(_, flag) => flag
-        }
-    }
 }
 
 /* If struct_id names a struct with a dtor, return Some(the dtor's id).
    Otherwise return none. */
 pub fn ty_dtor(cx: ctxt, struct_id: def_id) -> DtorKind {
     match cx.destructor_for_type.find(&struct_id) {
-        Some(&method_def_id) => {
-            let flag = !has_attr(cx, struct_id, "no_drop_flag");
-
-            TraitDtor(method_def_id, flag)
-        }
+        Some(&method_def_id) => TraitDtor(method_def_id),
         None => NoDtor,
     }
 }

trunk/src/libstd/unstable/atomics.rs

@@ -62,7 +62,6 @@ pub struct AtomicPtr<T> {
 /**
  * An owned atomic pointer. Ensures that only a single reference to the data is held at any time.
  */
-#[no_drop_flag]
 pub struct AtomicOption<T> {
     priv p: *mut c_void
 }

trunk/src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2013-06-23 f827561
+  macos-i386 63ffbcf99b6853d7840bdfe01380068518d0e466
+  macos-x86_64 b34fdf3845f8ef4760817007d8ef820cd32f2e07
+  winnt-i386 6602150074ec442fd376fddb2eaf63f5da6fdff9
+  freebsd-x86_64 a05bdda2d9ec0e66336d81b98bee8a95442a501f
+  linux-i386 b8f4a0f0c2250aa4d76ec1eb57c83bfae5725f93
+  linux-x86_64 caea3402663334d0a3967c21f58a860c060d5474
+
 S 2013-06-21 6759ce4
   macos-i386 6e5395d2fda1db356f64af28ba525031bf9871c7
   macos-x86_64 7b8ded4e1ba1e999a5614eea3a4acacb2c7cef1d