# HG changeset patch # User Doug Simon # Date 1354011514 -3600 # Node ID 8c4b757c2eb935de64a50f5e7d533b3d6fa1bf35 # Parent 52c88c405d07989572ece4207bfb2bdc0ccdc43c added more #ifdefs for GRAAL specific code diff -r 52c88c405d07 -r 8c4b757c2eb9 src/share/vm/oops/klass.hpp --- a/src/share/vm/oops/klass.hpp Mon Nov 26 19:30:54 2012 -0800 +++ b/src/share/vm/oops/klass.hpp Tue Nov 27 11:18:34 2012 +0100 @@ -147,8 +147,10 @@ Klass* _primary_supers[_primary_super_limit]; // java/lang/Class instance mirroring this class oop _java_mirror; +#ifdef GRAAL // com/oracle/graal/hotspot/HotSpotResolvedJavaType mirroring this class oop _graal_mirror; +#endif // Superclass Klass* _super; // First subclass (NULL if none); _subklass->next_sibling() is next one @@ -253,9 +255,11 @@ oop java_mirror() const { return _java_mirror; } void set_java_mirror(oop m) { klass_oop_store(&_java_mirror, m); } +#ifdef GRAAL // graal mirror oop graal_mirror() const { return _graal_mirror; } void set_graal_mirror(oop m) { oop_store((oop*) &_graal_mirror, m); } +#endif // modifier flags jint modifier_flags() const { return _modifier_flags; } @@ -316,7 +320,11 @@ static ByteSize modifier_flags_offset() { return in_ByteSize(offset_of(Klass, _modifier_flags)); } static ByteSize layout_helper_offset() { return in_ByteSize(offset_of(Klass, _layout_helper)); } static ByteSize access_flags_offset() { return in_ByteSize(offset_of(Klass, _access_flags)); } +#ifdef GRAAL static ByteSize graal_mirror_offset() { return in_ByteSize(offset_of(Klass, _graal_mirror)); } + static ByteSize next_sibling_offset() { return in_ByteSize(offset_of(Klass, _next_sibling)); } + static ByteSize subklass_offset() { return in_ByteSize(offset_of(Klass, _subklass)); } +#endif // Unpacking layout_helper: enum {