diff src/share/vm/graal/graalJavaAccess.hpp @ 16662:e7b7a5be4d21

Merge
author Stefan Anzinger <stefan.anzinger@gmail.com>
date Wed, 30 Jul 2014 10:39:39 -0700
parents 8c70d65ec04a 6bdd2ec553eb
children 6ea6d4c260c8
line wrap: on
line diff
--- a/src/share/vm/graal/graalJavaAccess.hpp	Wed Jul 30 09:36:32 2014 -0700
+++ b/src/share/vm/graal/graalJavaAccess.hpp	Wed Jul 30 10:39:39 2014 -0700
@@ -207,6 +207,8 @@
   end_class                                                                                                                                                    \
   start_class(NullConstant)                                                                                                                                    \
   end_class                                                                                                                                                    \
+  start_class(HotSpotCompressedNullConstant)                                                                                                                                    \
+  end_class                                                                                                                                                    \
   start_class(HotSpotObjectConstant)                                                                                                                           \
     oop_field(HotSpotObjectConstant, object, "Ljava/lang/Object;")                                                                                             \
   end_class                                                                                                                                                    \
@@ -223,8 +225,13 @@
     static_oop_field(Kind, Int, "Lcom/oracle/graal/api/meta/Kind;");                                                                                           \
     static_oop_field(Kind, Long, "Lcom/oracle/graal/api/meta/Kind;");                                                                                          \
   end_class                                                                                                                                                    \
+  start_class(LIRKind)                                                                                                                                         \
+    oop_field(LIRKind, platformKind, "Lcom/oracle/graal/api/meta/PlatformKind;")                                                                               \
+    int_field(LIRKind, referenceMask)                                                                                                                          \
+  end_class                                                                                                                                                    \
   start_class(Value)                                                                                                                                           \
     oop_field(Value, kind, "Lcom/oracle/graal/api/meta/Kind;")                                                                                                 \
+    oop_field(Value, lirKind, "Lcom/oracle/graal/api/meta/LIRKind;")                                                                                           \
     static_oop_field(Value, ILLEGAL, "Lcom/oracle/graal/api/meta/AllocatableValue;");                                                                          \
   end_class                                                                                                                                                    \
   start_class(RegisterValue)                                                                                                                                   \