graal-jvmci-8: src/share/vm/oops/instanceKlass.hpp comparison

comparison src/share/vm/oops/instanceKlass.hpp @ 7643:3ac7d10a6572

Merge with hsx25/hotspot.

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Thu, 31 Jan 2013 15:42:25 +0100
parents	989155e2d07a 212c5b9c38e7
children	5fc51c1ecdeb

comparison

equal deleted inserted replaced

-:17b6a63fe7c2
+:3ac7d10a6572
 int             _static_field_size;    // number words used by static fields (oop and non-oop) in this klass
 u2              _static_oop_field_count;// number of static oop fields in this klass
 u2              _java_fields_count;    // The number of declared Java fields
 int             _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
+// _is_marked_dependent can be set concurrently, thus cannot be part of the
+// _misc_flags.
 bool            _is_marked_dependent;  // used for marking during flushing and deoptimization
 enum {
 _misc_rewritten            = 1 << 0, // methods rewritten.
 _misc_has_nonstatic_fields = 1 << 1, // for sizing with UseCompressedOops
 _misc_should_verify_class  = 1 << 2, // allow caching of preverification
-_misc_is_anonymous         = 1 << 3  // has embedded _inner_classes field
+_misc_is_anonymous         = 1 << 3, // has embedded _inner_classes field
+_misc_is_contended         = 1 << 4, // marked with contended annotation
+_misc_has_default_methods  = 1 << 5  // class/superclass/implemented interfaces has default methods
 };
 u2              _misc_flags;
 u2              _minor_version;        // minor version number of class file
 u2              _major_version;        // major version number of class file
 Thread*         _init_thread;          // Pointer to current thread doing initialization (to handle recusive initialization)
 // JVMTI fields can be moved to their own structure - see 6315920
 unsigned char * _cached_class_file_bytes;       // JVMTI: cached class file, before retransformable agent modified it in CFLH
 jint            _cached_class_file_len;         // JVMTI: length of above
 JvmtiCachedClassFieldMap* _jvmti_cached_class_field_map;  // JVMTI: used during heap iteration
-// true if class, superclass, or implemented interfaces have default methods
-bool            _has_default_methods;
-volatile u2     _idnum_allocated_count;         // JNI/JVMTI: increments with the addition of methods, old ids don't change
 // Method array.
 Array<Method*>* _methods;
 // Interface (Klass*s) this class declares locally to implement.
 Array<Klass*>* _local_interfaces;
 // Interface (Klass*s) this class implements transitively.
 //     [generic signature index]
 //     [generic signature index]
 //     ...
 Array<u2>*      _fields;
+volatile u2     _idnum_allocated_count;         // JNI/JVMTI: increments with the addition of methods, old ids don't change
 // Class states are defined as ClassState (see above).
 // Place the _init_state here to utilize the unused 2-byte after
 // _idnum_allocated_count.
 u1              _init_state;                    // state of class
 // in places where the metadata is stored in other places, like nmethods
 oop klass_holder() const {
 return is_anonymous() ? java_mirror() : class_loader();
 }
+bool is_contended() const                {
+return (_misc_flags & _misc_is_contended) != 0;
+}
+void set_is_contended(bool value)        {
+if (value) {
+_misc_flags |= _misc_is_contended;
+} else {
+_misc_flags &= ~_misc_is_contended;
+}
+}
 // signers
 objArrayOop signers() const              { return _signers; }
 void set_signers(objArrayOop s)          { klass_oop_store((oop*)&_signers, s); }
 // source file name
 }
 JvmtiCachedClassFieldMap* jvmti_cached_class_field_map() const {
 return _jvmti_cached_class_field_map;
 }
-bool has_default_methods() const { return _has_default_methods; }
+bool has_default_methods() const {
-void set_has_default_methods(bool b) { _has_default_methods = b; }
+return (_misc_flags & _misc_has_default_methods) != 0;
+}
+void set_has_default_methods(bool b) {
+if (b) {
+_misc_flags |= _misc_has_default_methods;
+} else {
+_misc_flags &= ~_misc_has_default_methods;
+}
+}
 // for adding methods, ConstMethod::UNSET_IDNUM means no more ids available
 inline u2 next_method_idnum();
 void set_initial_method_idnum(u2 value)             { _idnum_allocated_count = value; }

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/oops/instanceKlass.hpp @ 7643:3ac7d10a6572