# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1312935221 -7200
# Node ID c4f88f4ede5416a32c4b6c620afd5feb760dc36e
# Parent  c919f101c1bf7f84d39be46dbece3a1715a3ef1b
Reflect API changes in JavaAccess.

diff -r c919f101c1bf -r c4f88f4ede54 src/share/vm/classfile/systemDictionary.hpp
--- a/src/share/vm/classfile/systemDictionary.hpp	Wed Aug 10 01:31:45 2011 +0200
+++ b/src/share/vm/classfile/systemDictionary.hpp	Wed Aug 10 02:13:41 2011 +0200
@@ -201,7 +201,7 @@
   template(CiTargetMethod_Safepoint_klass, com_sun_cri_ci_CiTargetMethod_Safepoint,                 Opt) \
   template(CiTargetMethod_ExceptionHandler_klass, com_sun_cri_ci_CiTargetMethod_ExceptionHandler,   Opt) \
   template(CiTargetMethod_Mark_klass,    com_sun_cri_ci_CiTargetMethod_Mark,                        Opt) \
-  template(GraalBitMap_klass,            com_oracle_max_graal_graph_BitMap,                         Opt) \
+  template(GraalBitMap_klass,            com_sun_cri_ci_CiBitMap,                                   Opt) \
   template(CiDebugInfo_klass,            com_sun_cri_ci_CiDebugInfo,                                Opt) \
   template(CiFrame_klass,                com_sun_cri_ci_CiFrame,                                    Opt) \
   template(CiValue_klass,                com_sun_cri_ci_CiValue,                                    Opt) \
diff -r c919f101c1bf -r c4f88f4ede54 src/share/vm/classfile/vmSymbols.hpp
--- a/src/share/vm/classfile/vmSymbols.hpp	Wed Aug 10 01:31:45 2011 +0200
+++ b/src/share/vm/classfile/vmSymbols.hpp	Wed Aug 10 02:13:41 2011 +0200
@@ -288,6 +288,7 @@
   template(com_sun_cri_ci_CiTargetMethod_ExceptionHandler, "com/sun/cri/ci/CiTargetMethod$ExceptionHandler")            \
   template(com_sun_cri_ci_CiTargetMethod_Mark,        "com/sun/cri/ci/CiTargetMethod$Mark")                             \
   template(com_oracle_max_graal_graph_BitMap,         "com/oracle/max/graal/graph/BitMap")                              \
+  template(com_sun_cri_ci_CiBitMap,	                  "com/sun/cri/ci/CiBitMap")                                        \
   template(com_sun_cri_ci_CiDebugInfo,                "com/sun/cri/ci/CiDebugInfo")                                     \
   template(com_sun_cri_ci_CiFrame,                    "com/sun/cri/ci/CiFrame")                                         \
   template(com_sun_cri_ci_CiValue,                    "com/sun/cri/ci/CiValue")                                         \
diff -r c919f101c1bf -r c4f88f4ede54 src/share/vm/graal/graalJavaAccess.hpp
--- a/src/share/vm/graal/graalJavaAccess.hpp	Wed Aug 10 01:31:45 2011 +0200
+++ b/src/share/vm/graal/graalJavaAccess.hpp	Wed Aug 10 02:13:41 2011 +0200
@@ -139,8 +139,8 @@
   end_class                                                                             \
   start_class(CiDebugInfo)                                                              \
     oop_field(CiDebugInfo, codePos, "Lcom/sun/cri/ci/CiCodePos;")                       \
-    oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/max/graal/graph/BitMap;")       \
-    oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/max/graal/graph/BitMap;")          \
+    oop_field(CiDebugInfo, registerRefMap, "Lcom/sun/cri/ci/CiBitMap;")                 \
+    oop_field(CiDebugInfo, frameRefMap, "Lcom/sun/cri/ci/CiBitMap;")                    \
   end_class                                                                             \
   start_class(GraalBitMap)                                                              \
     int_field(GraalBitMap, size)                                                        \