Mercurial > hg > graal-compiler
diff src/share/vm/runtime/fieldDescriptor.hpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 21 Aug 2012 10:39:19 +0200 |
| parents | feb590a8497f 1d7922586cf6 |
| children | e522a00b91aa |
line wrap: on
line diff
--- a/src/share/vm/runtime/fieldDescriptor.hpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/runtime/fieldDescriptor.hpp Tue Aug 21 10:39:19 2012 +0200 @@ -68,7 +68,7 @@ oop loader() const; // Offset (in words) of field from start of instanceOop / klassOop int offset() const { return field()->offset(); } - Symbol* generic_signature() const { return field()->generic_signature(_cp); } + Symbol* generic_signature() const; int index() const { return _index; } typeArrayOop annotations() const; @@ -101,6 +101,7 @@ bool is_field_access_watched() const { return access_flags().is_field_access_watched(); } bool is_field_modification_watched() const { return access_flags().is_field_modification_watched(); } + bool has_generic_signature() const { return access_flags().field_has_generic_signature(); } void set_is_field_access_watched(const bool value) { _access_flags.set_is_field_access_watched(value); @@ -116,6 +117,7 @@ void initialize(klassOop k, int index); // Print + void print() { print_on(tty); } void print_on(outputStream* st) const PRODUCT_RETURN; void print_on_for(outputStream* st, oop obj) PRODUCT_RETURN; };