diff src/share/vm/graal/graalJavaAccess.hpp @ 18186:ef357effbda7

Backout of changeset 9a804ec7f707 (converted Constant and Value to be interfaces).
author Roland Schatz <roland.schatz@oracle.com>
date Thu, 30 Oct 2014 11:18:48 +0100
parents c2270ad35f57
children 9619ba4daf4c
line wrap: on
line diff
--- a/src/share/vm/graal/graalJavaAccess.hpp	Wed Oct 29 15:23:46 2014 +0100
+++ b/src/share/vm/graal/graalJavaAccess.hpp	Thu Oct 30 11:18:48 2014 +0100
@@ -190,8 +190,8 @@
     oop_field(BytecodePosition, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;")                                                                      \
     int_field(BytecodePosition, bci)                                                                                                                           \
   end_class                                                                                                                                                    \
-  start_class(AbstractConstant)                                                                                                                                \
-    oop_field(AbstractConstant, kind, "Lcom/oracle/graal/api/meta/Kind;")                                                                                      \
+  start_class(Constant)                                                                                                                                        \
+    oop_field(Constant, kind, "Lcom/oracle/graal/api/meta/Kind;")                                                                                              \
   end_class                                                                                                                                                    \
   start_class(PrimitiveConstant)                                                                                                                               \
     long_field(PrimitiveConstant, primitive)                                                                                                                   \
@@ -226,12 +226,10 @@
     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(AbstractValue)                                                                                                                                   \
-    oop_field(AbstractValue, kind, "Lcom/oracle/graal/api/meta/Kind;")                                                                                         \
-    oop_field(AbstractValue, lirKind, "Lcom/oracle/graal/api/meta/LIRKind;")                                                                                   \
-  end_class                                                                                                                                                    \
   start_class(RegisterValue)                                                                                                                                   \
     oop_field(RegisterValue, reg, "Lcom/oracle/graal/api/code/Register;")                                                                                      \
   end_class                                                                                                                                                    \