--- old/src/share/vm/c1/c1_LinearScan.cpp	2014-04-24 15:53:11.000000000 -1000
+++ new/src/share/vm/c1/c1_LinearScan.cpp	2014-04-24 15:53:11.000000000 -1000
@@ -2614,7 +2614,7 @@
 
 #ifdef X86
   } else if (opr->is_single_xmm()) {
-    VMReg rname = opr->as_xmm_float_reg()->as_VMReg();
+    VMReg rname = opr->as_xmm_float_reg().as_VMReg();
     LocationValue* sv = new LocationValue(Location::new_reg_loc(Location::normal, rname));
 
     scope_values->append(sv);
@@ -2683,12 +2683,12 @@
 
     } else if (opr->is_double_cpu()) {
 #ifdef _LP64
-      VMReg rname_first = opr->as_register_lo()->as_VMReg();
+      VMReg rname_first = opr->as_register_lo().as_VMReg();
       first = new LocationValue(Location::new_reg_loc(Location::lng, rname_first));
       second = _int_0_scope_value;
 #else
-      VMReg rname_first = opr->as_register_lo()->as_VMReg();
-      VMReg rname_second = opr->as_register_hi()->as_VMReg();
+      VMReg rname_first = opr->as_register_lo().as_VMReg();
+      VMReg rname_second = opr->as_register_hi().as_VMReg();
 
       if (hi_word_offset_in_bytes < lo_word_offset_in_bytes) {
         // lo/hi and swapped relative to first and second, so swap them
@@ -2705,7 +2705,7 @@
 #ifdef X86
     } else if (opr->is_double_xmm()) {
       assert(opr->fpu_regnrLo() == opr->fpu_regnrHi(), "assumed in calculation");
-      VMReg rname_first  = opr->as_xmm_double_reg()->as_VMReg();
+      VMReg rname_first  = opr->as_xmm_double_reg().as_VMReg();
 #  ifdef _LP64
       first = new LocationValue(Location::new_reg_loc(Location::dbl, rname_first));
       second = _int_0_scope_value;