---

yaml
---
r: 30451
b: refs/heads/incoming
c: d6ceef9
h: refs/heads/master
i:
  30449: 5948dcb
  30447: 51acd32
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: a93de20148f215c6d542ea57a37825d7fa4d950d
+refs/heads/incoming: d6ceef95bae928dbaf6050c95939d39ac33e1725
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/alt.rs

@@ -427,6 +427,35 @@ impl branch_kind : cmp::Eq {
     pure fn ne(&&other: branch_kind) -> bool { !self.eq(other) }
 }
 
+// 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");
+    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 compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
                     chk: Option<mk_fail>, &exits: ~[exit_node]) {
     /*