---

yaml
---
r: 6695
b: refs/heads/master
c: e51c29f
h: refs/heads/master
i:
  6693: a2a0ec3
  6691: 118970c
  6687: aa69266
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b744b284ea5eca0f6158719038e5c91561a6dd0
+refs/heads/master: e51c29fab02c0315ebeef83acd4c01c135d32c46

trunk/src/comp/middle/trans.rs

@@ -1157,10 +1157,7 @@ fn declare_tydesc(cx: @local_ctxt, sp: span, t: ty::t, ty_params: [uint],
     ret info;
 }
 
-tag glue_helper {
-    default_helper(fn(@block_ctxt, ValueRef, ty::t));
-    copy_helper(fn(@block_ctxt, ValueRef, ValueRef, ty::t));
-}
+type glue_helper = fn(@block_ctxt, ValueRef, ty::t);
 
 fn declare_generic_glue(cx: @local_ctxt, t: ty::t, llfnty: TypeRef, name: str)
    -> ValueRef {
@@ -1215,14 +1212,7 @@ fn make_generic_glue_inner(cx: @local_ctxt, sp: span, t: ty::t,
     let lltop = bcx.llbb;
     let llrawptr0 = llvm::LLVMGetParam(llfn, 3u);
     let llval0 = BitCast(bcx, llrawptr0, llty);
-    alt helper {
-      default_helper(helper) { helper(bcx, llval0, t); }
-      copy_helper(helper) {
-        let llrawptr1 = llvm::LLVMGetParam(llfn, 4u);
-        let llval1 = BitCast(bcx, llrawptr1, llty);
-        helper(bcx, llval0, llval1, t);
-      }
-    }
+    helper(bcx, llval0, t);
     finish_fn(fcx, lltop);
     ret llfn;
 }
@@ -1749,7 +1739,7 @@ fn lazily_emit_tydesc_glue(cx: @block_ctxt, field: int,
                                          "take");
                 ti.take_glue = some::<ValueRef>(glue_fn);
                 make_generic_glue(lcx, cx.sp, ti.ty, glue_fn,
-                                  default_helper(make_take_glue),
+                                  make_take_glue,
                                   ti.ty_params, "take");
                 log #fmt["--- lazily_emit_tydesc_glue TAKE %s",
                          ty_to_str(bcx_tcx(cx), ti.ty)];
@@ -1767,7 +1757,7 @@ fn lazily_emit_tydesc_glue(cx: @block_ctxt, field: int,
                                          "drop");
                 ti.drop_glue = some::<ValueRef>(glue_fn);
                 make_generic_glue(lcx, cx.sp, ti.ty, glue_fn,
-                                  default_helper(make_drop_glue),
+                                  make_drop_glue,
                                   ti.ty_params, "drop");
                 log #fmt["--- lazily_emit_tydesc_glue DROP %s",
                          ty_to_str(bcx_tcx(cx), ti.ty)];
@@ -1785,7 +1775,7 @@ fn lazily_emit_tydesc_glue(cx: @block_ctxt, field: int,
                                          "free");
                 ti.free_glue = some::<ValueRef>(glue_fn);
                 make_generic_glue(lcx, cx.sp, ti.ty, glue_fn,
-                                  default_helper(make_free_glue),
+                                  make_free_glue,
                                   ti.ty_params, "free");
                 log #fmt["--- lazily_emit_tydesc_glue FREE %s",
                          ty_to_str(bcx_tcx(cx), ti.ty)];