--- a/src/share/vm/graal/graalCodeInstaller.cpp	Mon Jun 20 13:54:44 2011 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Mon Jun 20 14:07:11 2011 +0200
@@ -55,11 +55,11 @@
 static bool is_bit_set(oop bit_map, int i) {
   const int MapWordBits = 64;
   if (i < MapWordBits) {
-    jlong low = CiBitMap::low(bit_map);
+    jlong low = GraalBitMap::low(bit_map);
     return (low & (1LL << i)) != 0;
   } else {
     jint extra_idx = (i - MapWordBits) / MapWordBits;
-    arrayOop extra = (arrayOop) CiBitMap::extra(bit_map);
+    arrayOop extra = (arrayOop) GraalBitMap::extra(bit_map);
     assert(extra_idx >= 0 && extra_idx < extra->length(), "unexpected index");
     jlong word = ((jlong*) extra->base(T_LONG))[extra_idx];
     return (word & (1LL << (i % MapWordBits))) != 0;
@@ -73,7 +73,7 @@
   oop frame_map = (oop) CiDebugInfo::frameRefMap(debug_info);
 
   if (register_map != NULL) {
-    assert(CiBitMap::size(register_map) == (unsigned) NUM_CPU_REGS, "unexpected register_map length");
+    assert(BitMap::size(register_map) == (unsigned) NUM_CPU_REGS, "unexpected register_map length");
     for (jint i = 0; i < NUM_CPU_REGS; i++) {
       bool is_oop = is_bit_set(register_map, i);
       VMReg reg = get_hotspot_reg(i);
@@ -87,7 +87,7 @@
   }
 
   if (frame_size > 0) {
-    assert(CiBitMap::size(frame_map) == frame_size / HeapWordSize, "unexpected frame_map length");
+    assert(BitMap::size(frame_map) == frame_size / HeapWordSize, "unexpected frame_map length");
 
     for (jint i = 0; i < frame_size / HeapWordSize; i++) {
       bool is_oop = is_bit_set(frame_map, i);
@@ -100,7 +100,7 @@
       }
     }
   } else {
-    assert(frame_map == NULL || CiBitMap::size(frame_map) == 0, "cannot have frame_map for frames with size 0");
+    assert(frame_map == NULL || BitMap::size(frame_map) == 0, "cannot have frame_map for frames with size 0");
   }
 
   return map;