# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1371047323 -7200
# Node ID 2beeb916aa31f6a12b8ff7b3bcd365442e95b890
# Parent  0c717bcb298841883f30d85b4f0a2ea0cb204120
Add arrayKlassOffset field to HotSpotVMConfig.

diff -r 0c717bcb2988 -r 2beeb916aa31 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Thu Jun 13 14:47:32 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Wed Jun 12 16:28:43 2013 +0200
@@ -329,6 +329,11 @@
     public int klassOffset;
 
     /**
+     * The offset of the injected array klass field in a {@link Class}.
+     */
+    public int arrayKlassOffset;
+
+    /**
      * The offset of the injected graal_mirror field in a {@link Class}.
      */
     public int graalMirrorInClassOffset;
diff -r 0c717bcb2988 -r 2beeb916aa31 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java	Thu Jun 13 14:47:32 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java	Wed Jun 12 16:28:43 2013 +0200
@@ -521,6 +521,11 @@
     }
 
     @Fold
+    public static int arrayKlassOffset() {
+        return config().arrayKlassOffset;
+    }
+
+    @Fold
     public static int classMirrorOffset() {
         return config().classMirrorOffset;
     }
diff -r 0c717bcb2988 -r 2beeb916aa31 src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Thu Jun 13 14:47:32 2013 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Wed Jun 12 16:28:43 2013 +0200
@@ -726,6 +726,7 @@
   set_int("klassModifierFlagsOffset", in_bytes(Klass::modifier_flags_offset()));
   set_int("klassAccessFlagsOffset", in_bytes(Klass::access_flags_offset()));
   set_int("klassOffset", java_lang_Class::klass_offset_in_bytes());
+  set_int("arrayKlassOffset", java_lang_Class::array_klass_offset_in_bytes());
   set_int("graalMirrorInClassOffset", java_lang_Class::graal_mirror_offset_in_bytes());
   set_int("klassLayoutHelperOffset", in_bytes(Klass::layout_helper_offset()));
   set_int("klassSuperKlassOffset", in_bytes(Klass::super_offset()));