---

yaml
---
r: 32519
b: refs/heads/dist-snap
c: bea6fe0
h: refs/heads/master
i:
  32517: 1f253a2
  32515: 92707fe
  32511: 957a53a
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: 10aa849d28d74c2c332f24a0da55833c95d91ab1
+refs/heads/dist-snap: bea6fe0ec12439187617bfc27f23962d018f8463
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -428,32 +428,18 @@ impl branch_kind : cmp::Eq {
 }
 
 // Compiles a comparison between two things.
-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");
+fn compare_values(cx: block, lhs: ValueRef, rhs: ValueRef, rhs_t: ty::t) ->
+                  Result {
+    let _icx = cx.insn_ctxt("compare_values");
     if ty::type_is_scalar(rhs_t) {
-      let rs = compare_scalar_types(cx, lhs, rhs, rhs_t, op);
+      let rs = compare_scalar_types(cx, lhs, rhs, rhs_t, ast::eq);
       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 llop = C_u8(abi::cmp_glue_op_eq);
     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")
-    }
+    rslt(cx, cmpval)
 }
 
 fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
@@ -663,15 +649,12 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
                     do with_scope_result(bcx, None, ~"compare_scope") |bcx| {
                         match trans_opt(bcx, opt) {
                             single_result(
-                                Result {bcx, val}) =>
-                            {
-                                trans_compare(bcx, ast::eq, test_val,
-                                              t, val, t)
+                                Result {bcx, val}) => {
+                                compare_values(bcx, test_val, val, t)
                             }
                             range_result(
                                 Result {val: vbegin, _},
-                                Result {bcx, val: vend}) =>
-                            {
+                                Result {bcx, val: vend}) => {
                                 let Result {bcx, val: llge} =
                                     compare_scalar_types(bcx, test_val,
                                                          vbegin, t, ast::ge);