--- old/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	2014-04-24 15:52:58.000000000 -1000
+++ new/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	2014-04-24 15:52:58.000000000 -1000
@@ -1012,7 +1012,7 @@
       __ movptr(compressed_src, src->as_register());
       __ encode_heap_oop(compressed_src);
       if (patch_code != lir_patch_none) {
-        info->oop_map()->set_narrowoop(compressed_src->as_VMReg());
+        info->oop_map()->set_narrowoop(compressed_src.as_VMReg());
       }
     }
 #endif
@@ -1112,7 +1112,7 @@
     case T_BOOLEAN: {
       Register src_reg = src->as_register();
       Address dst_addr = as_Address(to_addr);
-      assert(VM_Version::is_P6() || src_reg->has_byte_register(), "must use byte registers if not P6");
+      assert(VM_Version::is_P6() || src_reg.has_byte_register(), "must use byte registers if not P6");
       __ movb(dst_addr, src_reg);
       break;
     }
@@ -1338,7 +1338,7 @@
     case T_BOOLEAN: // fall through
     case T_BYTE: {
       Register dest_reg = dest->as_register();
-      assert(VM_Version::is_P6() || dest_reg->has_byte_register(), "must use byte registers if not P6");
+      assert(VM_Version::is_P6() || dest_reg.has_byte_register(), "must use byte registers if not P6");
       if (VM_Version::is_P6() || from_addr.uses(dest_reg)) {
         __ movsbl(dest_reg, from_addr);
       } else {
@@ -1351,7 +1351,7 @@
 
     case T_CHAR: {
       Register dest_reg = dest->as_register();
-      assert(VM_Version::is_P6() || dest_reg->has_byte_register(), "must use byte registers if not P6");
+      assert(VM_Version::is_P6() || dest_reg.has_byte_register(), "must use byte registers if not P6");
       if (VM_Version::is_P6() || from_addr.uses(dest_reg)) {
         __ movzwl(dest_reg, from_addr);
       } else {
@@ -1988,7 +1988,7 @@
     Register newval = op->new_value()->as_register();
     Register cmpval = op->cmp_value()->as_register();
     assert(cmpval == rax, "wrong register");
-    assert(newval != NULL, "new val must be register");
+    assert(newval != noreg, "new val must be register");
     assert(cmpval != newval, "cmp and new values must be in different registers");
     assert(cmpval != addr, "cmp and addr must be in different registers");
     assert(newval != addr, "new value and addr must be in different registers");
@@ -2025,7 +2025,7 @@
     Register newval = op->new_value()->as_register_lo();
     Register cmpval = op->cmp_value()->as_register_lo();
     assert(cmpval == rax, "wrong register");
-    assert(newval != NULL, "new val must be register");
+    assert(newval != noreg, "new val must be register");
     assert(cmpval != newval, "cmp and new values must be in different registers");
     assert(cmpval != addr, "cmp and addr must be in different registers");
     assert(newval != addr, "new value and addr must be in different registers");