--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp	Mon Apr 04 10:56:12 2011 +0200
+++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp	Mon Apr 04 18:47:04 2011 +0200
@@ -395,7 +395,7 @@
     record_scope(pc_offset, caller_pos);
   }
   oop frame = NULL;
-  if (code_pos->klass()->klass_part()->name() == vmSymbols::com_sun_cri_ci_CiDebugInfo_Frame()) {
+  if (code_pos->klass()->klass_part()->name() == vmSymbols::com_sun_cri_ci_CiFrame()) {
     frame = code_pos;
   }
 
@@ -417,10 +417,10 @@
   }
 
   if (frame != NULL) {
-    jint local_count = CiDebugInfo_Frame::numLocals(frame);
-    jint expression_count = CiDebugInfo_Frame::numStack(frame);
-    jint monitor_count = CiDebugInfo_Frame::numLocks(frame);
-    arrayOop values = (arrayOop) CiDebugInfo_Frame::values(frame);
+    jint local_count = CiFrame::numLocals(frame);
+    jint expression_count = CiFrame::numStack(frame);
+    jint monitor_count = CiFrame::numLocks(frame);
+    arrayOop values = (arrayOop) CiFrame::values(frame);
 
     assert(local_count + expression_count + monitor_count == values->length(), "unexpected values length");