---

yaml
---
r: 66495
b: refs/heads/master
c: 45e2582
h: refs/heads/master
i:
  66493: d9f9519
  66491: fa2c9e2
  66487: 8a0477d
  66479: 1ad0de5
  66463: e1ac880
  66431: 50ab1a6
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7f3752c7f95a2439db774d977da0caa299ef48e6
+refs/heads/master: 45e2582e09dd97d01a01e351c47da210bd6803f3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

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

@@ -486,6 +486,9 @@ pub fn make_closure_glue(
     }
 }
 
+// note: unique pointers no longer copy the type descriptor in the take glue,
+// so we cannot delegate to the unique box take glue here without copying it
+// ourselves
 pub fn make_opaque_cbox_take_glue(
     bcx: block,
     sigil: ast::Sigil,

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

@@ -52,13 +52,5 @@ pub fn duplicate(bcx: block, src_box: ValueRef, src_ty: ty::t) -> Result {
     } = malloc_unique(bcx, body_datum.ty);
     body_datum.copy_to(bcx, datum::INIT, dst_body);
 
-    // Copy the type descriptor
-    let src_tydesc_ptr = GEPi(bcx, src_box,
-                              [0u, back::abi::box_field_tydesc]);
-    let dst_tydesc_ptr = GEPi(bcx, dst_box,
-                              [0u, back::abi::box_field_tydesc]);
-    let td = Load(bcx, src_tydesc_ptr);
-    Store(bcx, td, dst_tydesc_ptr);
-
-    return rslt(bcx, dst_box);
+    rslt(bcx, dst_box)
 }