---

yaml
---
r: 3455
b: refs/heads/master
c: bbd0d58
h: refs/heads/master
i:
  3453: 67ba269
  3451: 978f6b2
  3447: 1b3fe86
  3439: 522c580
  3423: fafd452
  3391: f256c57
  3327: fae2cb5
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47b3e087e945a2a8fcfd1179e333746d294c1259
+refs/heads/master: bbd0d589550b11a3267c9e52608813f54bf3b89a

trunk/src/comp/middle/trans.rs

@@ -3180,14 +3180,21 @@ fn copy_val(&@block_ctxt cx, copy_action action, ValueRef dst, ValueRef src,
         ret rslt(bcx, bcx.build.Store(src, dst));
     } else if (ty::type_is_structural(ccx.tcx, t) ||
                    ty::type_has_dynamic_size(ccx.tcx, t)) {
-        auto bcx;
+        // Check for self-assignment.
+        auto do_copy_cx = new_sub_block_ctxt(cx, "do_copy");
+        auto next_cx = new_sub_block_ctxt(cx, "next");
+        auto self_assigning = cx.build.ICmp(lib::llvm::LLVMIntNE,
+            cx.build.PointerCast(dst, val_ty(src)), src);
+        cx.build.CondBr(self_assigning, do_copy_cx.llbb, next_cx.llbb);
+
         if (action == DROP_EXISTING) {
-            bcx = drop_ty(cx, dst, t).bcx;
-        } else {
-            bcx = cx;
+            do_copy_cx = drop_ty(do_copy_cx, dst, t).bcx;
         }
-        bcx = memmove_ty(bcx, dst, src, t).bcx;
-        ret copy_ty(bcx, dst, t);
+        do_copy_cx = memmove_ty(do_copy_cx, dst, src, t).bcx;
+        do_copy_cx = copy_ty(do_copy_cx, dst, t).bcx;
+        do_copy_cx.build.Br(next_cx.llbb);
+
+        ret rslt(next_cx, C_nil());
     }
     ccx.sess.bug("unexpected type in trans::copy_val: " +
                  ty_to_str(ccx.tcx, t));