---

yaml
---
r: 32534
b: refs/heads/dist-snap
c: 23880da
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: cd8ec6d9236867d3f088432033f56b6ad29c15a7
+refs/heads/dist-snap: 23880daef2fbdfc01f8651fa8e84eb9700cceb3c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/back/abi.rs

@@ -43,12 +43,6 @@ const tydesc_field_shape: uint = 6u;
 const tydesc_field_shape_tables: uint = 7u;
 const n_tydesc_fields: uint = 8u;
 
-const cmp_glue_op_eq: uint = 0u;
-
-const cmp_glue_op_lt: uint = 1u;
-
-const cmp_glue_op_le: uint = 2u;
-
 // The two halves of a closure: code and environment.
 const fn_field_code: uint = 0u;
 const fn_field_box: uint = 1u;

branches/dist-snap/src/rustc/back/upcall.rs

@@ -18,7 +18,6 @@ type upcalls =
      mark: ValueRef,
      str_new_uniq: ValueRef,
      str_new_shared: ValueRef,
-     cmp_type: ValueRef,
      log_type: ValueRef,
      call_shim_on_c_stack: ValueRef,
      call_shim_on_rust_stack: ValueRef,
@@ -74,12 +73,6 @@ fn declare_upcalls(targ_cfg: @session::config,
           str_new_shared:
               nothrow(d(~"str_new_shared", ~[T_ptr(T_i8()), int_t],
                         T_ptr(T_i8()))),
-          cmp_type:
-              dv(~"cmp_type",
-                 ~[T_ptr(T_i1()), T_ptr(tydesc_type),
-                  T_ptr(T_i8()),
-                  T_ptr(T_i8()),
-                  T_i8()]),
           log_type:
               dv(~"log_type", ~[T_ptr(tydesc_type),
                               T_ptr(T_i8()), T_i32()]),

branches/dist-snap/src/rustc/middle/trans/glue.rs

@@ -253,27 +253,6 @@ fn call_tydesc_glue(++cx: block, v: ValueRef, t: ty::t, field: uint)
     return cx;
 }
 
-fn call_cmp_glue(bcx: block, lhs: ValueRef, rhs: ValueRef, t: ty::t,
-                 llop: ValueRef) -> ValueRef {
-    // We can't use call_tydesc_glue_full() and friends here because compare
-    // glue has a special signature.
-    let _icx = bcx.insn_ctxt("call_cmp_glue");
-
-    let lllhs = spill_if_immediate(bcx, lhs, t);
-    let llrhs = spill_if_immediate(bcx, rhs, t);
-
-    let llrawlhsptr = BitCast(bcx, lllhs, T_ptr(T_i8()));
-    let llrawrhsptr = BitCast(bcx, llrhs, T_ptr(T_i8()));
-    let lltydesc = get_tydesc_simple(bcx.ccx(), t);
-
-    let llfn = bcx.ccx().upcalls.cmp_type;
-
-    let llcmpresultptr = alloca(bcx, T_i1());
-    Call(bcx, llfn, ~[llcmpresultptr, lltydesc,
-                      llrawlhsptr, llrawrhsptr, llop]);
-    return Load(bcx, llcmpresultptr);
-}
-
 fn make_visit_glue(bcx: block, v: ValueRef, t: ty::t) {
     let _icx = bcx.insn_ctxt("make_visit_glue");
     let mut bcx = bcx;