diff --git a/src/memory.rs b/src/memory.rs
index 348437f50b6..8bb39d5167f 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -543,7 +543,8 @@ impl<'a, 'tcx> Memory<'a, 'tcx> {
             I16 | U16              => (2, val.bits as u16 as u64),
             I32 | U32 | F32 | Char => (4, val.bits as u32 as u64),
             I64 | U64 | F64        => (8, val.bits),
-            FnPtr | Ptr            => bug!("handled above"),
+            // int -> ptr transmutes are handled here
+            FnPtr | Ptr            => return self.write_usize(dest, val.bits),
         };
 
         self.write_uint(dest, bits, size)
diff --git a/tests/run-pass/binops.rs b/tests/run-pass/binops.rs
new file mode 100644
index 00000000000..9466f115b1a
--- /dev/null
+++ b/tests/run-pass/binops.rs
@@ -0,0 +1,96 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Binop corner cases
+
+fn test_nil() {
+    assert_eq!((), ());
+    assert!((!(() != ())));
+    assert!((!(() < ())));
+    assert!((() <= ()));
+    assert!((!(() > ())));
+    assert!((() >= ()));
+}
+
+fn test_bool() {
+    assert!((!(true < false)));
+    assert!((!(true <= false)));
+    assert!((true > false));
+    assert!((true >= false));
+
+    assert!((false < true));
+    assert!((false <= true));
+    assert!((!(false > true)));
+    assert!((!(false >= true)));
+
+    // Bools support bitwise binops
+    assert_eq!(false & false, false);
+    assert_eq!(true & false, false);
+    assert_eq!(true & true, true);
+    assert_eq!(false | false, false);
+    assert_eq!(true | false, true);
+    assert_eq!(true | true, true);
+    assert_eq!(false ^ false, false);
+    assert_eq!(true ^ false, true);
+    assert_eq!(true ^ true, false);
+}
+
+fn test_ptr() {
+    unsafe {
+        let p1: *const u8 = ::std::mem::transmute(0_usize);
+        let p2: *const u8 = ::std::mem::transmute(0_usize);
+        let p3: *const u8 = ::std::mem::transmute(1_usize);
+
+        assert_eq!(p1, p2);
+        assert!(p1 != p3);
+        assert!(p1 < p3);
+        assert!(p1 <= p3);
+        assert!(p3 > p1);
+        assert!(p3 >= p3);
+        assert!(p1 <= p2);
+        assert!(p1 >= p2);
+    }
+}
+
+#[derive(PartialEq, Debug)]
+struct P {
+    x: isize,
+    y: isize,
+}
+
+fn p(x: isize, y: isize) -> P {
+    P {
+        x: x,
+        y: y
+    }
+}
+
+fn test_class() {
+  let q = p(1, 2);
+  let mut r = p(1, 2);
+
+  unsafe {
+  println!("q = {:x}, r = {:x}",
+         (::std::mem::transmute::<*const P, usize>(&q)),
+         (::std::mem::transmute::<*const P, usize>(&r)));
+  }
+  assert_eq!(q, r);
+  r.y = 17;
+  assert!((r.y != q.y));
+  assert_eq!(r.y, 17);
+  assert!((q != r));
+}
+
+pub fn main() {
+    test_nil();
+    test_bool();
+    test_ptr();
+    test_class();
+}