---

yaml
---
r: 21747
b: refs/heads/snap-stage3
c: 7e9f98a
h: refs/heads/master
i:
  21745: 26fde7f
  21743: 8fffcfe
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5eccf849193f3de8da050eac960bc7f5df104c2f
+refs/heads/snap-stage3: 7e9f98a8c95588b7c88e5d4b4db1890e086257ee
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/middle/trans/alt.rs

@@ -672,10 +672,12 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
                                 Result {val: vbegin, _},
                                 Result {bcx, val: vend}) =>
                             {
-                                let Result {bcx, val: llge} = trans_compare(
-                                    bcx, ast::ge, test_val, t, vbegin, t);
-                                let Result {bcx, val: llle} = trans_compare(
-                                    bcx, ast::le, test_val, t, vend, t);
+                                let Result {bcx, val: llge} =
+                                    compare_scalar_types(bcx, test_val,
+                                                         vbegin, t, ast::ge);
+                                let Result {bcx, val: llle} =
+                                    compare_scalar_types(bcx, test_val, vend,
+                                                         t, ast::le);
                                 rslt(bcx, And(bcx, llge, llle))
                             }
                         }

branches/snap-stage3/src/rustc/middle/trans/base.rs

@@ -610,34 +610,6 @@ fn iter_structural_ty(cx: block, av: ValueRef, t: ty::t,
     return cx;
 }
 
-fn trans_compare(cx: block, op: ast::binop, lhs: ValueRef,
-                 _lhs_t: ty::t, rhs: ValueRef, rhs_t: ty::t) -> Result {
-    let _icx = cx.insn_ctxt("trans_compare");
-    if ty::type_is_scalar(rhs_t) {
-      let rs = compare_scalar_types(cx, lhs, rhs, rhs_t, op);
-      return rslt(rs.bcx, rs.val);
-    }
-
-    // Determine the operation we need.
-    let llop = {
-        match op {
-          ast::eq | ast::ne => C_u8(abi::cmp_glue_op_eq),
-          ast::lt | ast::ge => C_u8(abi::cmp_glue_op_lt),
-          ast::le | ast::gt => C_u8(abi::cmp_glue_op_le),
-          _ => cx.tcx().sess.bug(~"trans_compare got non-comparison-op")
-        }
-    };
-
-    let cmpval = glue::call_cmp_glue(cx, lhs, rhs, rhs_t, llop);
-
-    // Invert the result if necessary.
-    match op {
-      ast::eq | ast::lt | ast::le => rslt(cx, cmpval),
-      ast::ne | ast::ge | ast::gt => rslt(cx, Not(cx, cmpval)),
-      _ => cx.tcx().sess.bug(~"trans_compare got non-comparison-op")
-    }
-}
-
 fn cast_shift_expr_rhs(cx: block, op: ast::binop,
                        lhs: ValueRef, rhs: ValueRef) -> ValueRef {
     cast_shift_rhs(op, lhs, rhs,