--- old/src/cpu/x86/vm/c1_FrameMap_x86.cpp	2014-04-24 15:52:57.000000000 -1000
+++ new/src/cpu/x86/vm/c1_FrameMap_x86.cpp	2014-04-24 15:52:57.000000000 -1000
@@ -59,7 +59,7 @@
     }
   } else if (r_1->is_FloatRegister()) {
     assert(type == T_DOUBLE || type == T_FLOAT, "wrong type");
-    int num = r_1->as_FloatRegister()->encoding();
+    int num = r_1->as_FloatRegister().encoding();
     if (type == T_FLOAT) {
       opr = LIR_OprFact::single_fpu(num);
     } else {
@@ -67,7 +67,7 @@
     }
   } else if (r_1->is_XMMRegister()) {
     assert(type == T_DOUBLE || type == T_FLOAT, "wrong type");
-    int num = r_1->as_XMMRegister()->encoding();
+    int num = r_1->as_XMMRegister().encoding();
     if (type == T_FLOAT) {
       opr = LIR_OprFact::single_xmm(num);
     } else {
@@ -144,7 +144,7 @@
 LIR_Opr FrameMap::_caller_save_fpu_regs[] = { 0, };
 LIR_Opr FrameMap::_caller_save_xmm_regs[] = { 0, };
 
-XMMRegister FrameMap::_xmm_regs [] = { 0, };
+XMMRegister FrameMap::_xmm_regs[];
 
 XMMRegister FrameMap::nr2xmmreg(int rnr) {
   assert(_init_done, "tables not initialized");
@@ -333,10 +333,10 @@
 //  arguments   non-argument locals
 
 
-VMReg FrameMap::fpu_regname (int n) {
+VMReg FrameMap::fpu_regname(int n) {
   // Return the OptoReg name for the fpu stack slot "n"
   // A spilled fpu stack slot comprises to two single-word OptoReg's.
-  return as_FloatRegister(n)->as_VMReg();
+  return as_FloatRegister(n).as_VMReg();
 }
 
 LIR_Opr FrameMap::stack_pointer() {