--- a/hotspot/src/share/vm/oops/klass.hpp Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/oops/klass.hpp Sat Sep 01 13:25:18 2012 -0400
@@ -29,8 +29,8 @@
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
#include "memory/specialized_oop_closures.hpp"
-#include "oops/klassOop.hpp"
#include "oops/klassPS.hpp"
+#include "oops/metadata.hpp"
#include "oops/oop.hpp"
#include "runtime/orderAccess.hpp"
#include "trace/traceMacros.hpp"
@@ -41,12 +41,11 @@
#include "gc_implementation/parNew/parOopClosures.hpp"
#endif
-// A Klass is the part of the klassOop that provides:
+//
+// A Klass provides:
// 1: language level class object (method dictionary etc.)
// 2: provide vm dispatch behavior for the object
-// Both functions are combined into one C++ class. The toplevel class "Klass"
-// implements purpose 1 whereas all subclasses provide extra virtual functions
-// for purpose 2.
+// Both functions are combined into one C++ class.
// One reason for the oop/klass dichotomy in the implementation is
// that we don't want a C++ vtbl pointer in every object. Thus,
@@ -57,11 +56,10 @@
// ALL FUNCTIONS IMPLEMENTING THIS DISPATCH ARE PREFIXED WITH "oop_"!
// Klass layout:
-// [header ] klassOop
-// [klass pointer ] klassOop
-// [C++ vtbl ptr ] (contained in Klass_vtbl)
+// [C++ vtbl ptr ] (contained in Metadata)
// [layout_helper ]
// [super_check_offset ] for fast subtype checks
+// [name ]
// [secondary_super_cache] for fast subtype checks
// [secondary_supers ] array of 2ndary supertypes
// [primary_supers 0]
@@ -71,9 +69,10 @@
// [primary_supers 7]
// [java_mirror ]
// [super ]
-// [name ]
-// [first subklass]
+// [subklass ] first subclass
// [next_sibling ] link to chain additional subklasses
+// [next_link ]
+// [class_loader_data]
// [modifier_flags]
// [access_flags ]
// [verify_count ] - not in product
@@ -81,97 +80,19 @@
// [last_biased_lock_bulk_revocation_time] (64 bits)
// [prototype_header]
// [biased_lock_revocation_count]
+// [_modified_oops]
+// [_accumulated_modified_oops]
// [trace_id]
// Forward declarations.
+template <class T> class Array;
+template <class T> class GrowableArray;
+class ClassLoaderData;
class klassVtable;
-class KlassHandle;
-class OrderAccess;
-
-// Holder (or cage) for the C++ vtable of each kind of Klass.
-// We want to tightly constrain the location of the C++ vtable in the overall layout.
-class Klass_vtbl {
- protected:
- // The following virtual exists only to force creation of a C++ vtable,
- // so that this class truly is the location of the vtable of all Klasses.
- virtual void unused_initial_virtual() { }
+class ParCompactionManager;
- public:
- // The following virtual makes Klass_vtbl play a second role as a
- // factory protocol for subclasses of Klass ("sub-Klasses").
- // Here's how it works....
- //
- // This VM uses metaobjects as factories for their instances.
- //
- // In order to initialize the C++ vtable of a new instance, its
- // metaobject is forced to use the C++ placed new operator to
- // allocate the instance. In a typical C++-based system, each
- // sub-class would have its own factory routine which
- // directly uses the placed new operator on the desired class,
- // and then calls the appropriate chain of C++ constructors.
- //
- // However, this system uses shared code to performs the first
- // allocation and initialization steps for all sub-Klasses.
- // (See base_create_klass() and base_create_array_klass().)
- // This does not factor neatly into a hierarchy of C++ constructors.
- // Each caller of these shared "base_create" routines knows
- // exactly which sub-Klass it is creating, but the shared routine
- // does not, even though it must perform the actual allocation.
- //
- // Therefore, the caller of the shared "base_create" must wrap
- // the specific placed new call in a virtual function which
- // performs the actual allocation and vtable set-up. That
- // virtual function is here, Klass_vtbl::allocate_permanent.
- //
- // The arguments to Universe::allocate_permanent() are passed
- // straight through the placed new operator, which in turn
- // obtains them directly from this virtual call.
- //
- // This virtual is called on a temporary "example instance" of the
- // sub-Klass being instantiated, a C++ auto variable. The "real"
- // instance created by this virtual is on the VM heap, where it is
- // equipped with a klassOopDesc header.
- //
- // It is merely an accident of implementation that we use "example
- // instances", but that is why the virtual function which implements
- // each sub-Klass factory happens to be defined by the same sub-Klass
- // for which it creates instances.
- //
- // The vtbl_value() call (see below) is used to strip away the
- // accidental Klass-ness from an "example instance" and present it as
- // a factory. Think of each factory object as a mere container of the
- // C++ vtable for the desired sub-Klass. Since C++ does not allow
- // direct references to vtables, the factory must also be delegated
- // the task of allocating the instance, but the essential point is
- // that the factory knows how to initialize the C++ vtable with the
- // right pointer value. All other common initializations are handled
- // by the shared "base_create" subroutines.
- //
- virtual void* allocate_permanent(KlassHandle& klass, int size, TRAPS) const = 0;
- void post_new_init_klass(KlassHandle& klass, klassOop obj) const;
-
- // Every subclass on which vtbl_value is called must include this macro.
- // Delay the installation of the klassKlass pointer until after the
- // the vtable for a new klass has been installed (after the call to new()).
-#define DEFINE_ALLOCATE_PERMANENT(thisKlass) \
- void* allocate_permanent(KlassHandle& klass_klass, int size, TRAPS) const { \
- void* result = new(klass_klass, size, THREAD) thisKlass(); \
- if (HAS_PENDING_EXCEPTION) return NULL; \
- klassOop new_klass = ((Klass*) result)->as_klassOop(); \
- OrderAccess::storestore(); \
- post_new_init_klass(klass_klass, new_klass); \
- return result; \
- }
-
- bool null_vtbl() { return *(intptr_t*)this == 0; }
-
- protected:
- void* operator new(size_t ignored, KlassHandle& klass, int size, TRAPS);
-};
-
-
-class Klass : public Klass_vtbl {
+class Klass : public Metadata {
friend class VMStructs;
protected:
// note: put frequently-used fields together at start of klass structure
@@ -202,7 +123,7 @@
// Note that the array-kind tag looks like 0x00 for instance klasses,
// since their length in bytes is always less than 24Mb.
//
- // Final note: This comes first, immediately after Klass_vtbl,
+ // Final note: This comes first, immediately after C++ vtable,
// because it is frequently queried.
jint _layout_helper;
@@ -218,37 +139,27 @@
// [Ljava/lang/String;, etc. Set to zero for all other kinds of classes.
Symbol* _name;
- public:
- oop* oop_block_beg() const { return adr_secondary_super_cache(); }
- oop* oop_block_end() const { return adr_next_sibling() + 1; }
-
- protected:
- //
- // The oop block. All oop fields must be declared here and only oop fields
- // may be declared here. In addition, the first and last fields in this block
- // must remain first and last, unless oop_block_beg() and/or oop_block_end()
- // are updated. Grouping the oop fields in a single block simplifies oop
- // iteration.
- //
-
// Cache of last observed secondary supertype
- klassOop _secondary_super_cache;
+ Klass* _secondary_super_cache;
// Array of all secondary supertypes
- objArrayOop _secondary_supers;
+ Array<Klass*>* _secondary_supers;
// Ordered list of all primary supertypes
- klassOop _primary_supers[_primary_super_limit];
+ Klass* _primary_supers[_primary_super_limit];
// java/lang/Class instance mirroring this class
oop _java_mirror;
// Superclass
- klassOop _super;
+ Klass* _super;
// First subclass (NULL if none); _subklass->next_sibling() is next one
- klassOop _subklass;
+ Klass* _subklass;
// Sibling link (or NULL); links all subklasses of a klass
- klassOop _next_sibling;
+ Klass* _next_sibling;
- //
- // End of the oop block.
- //
+ // All klasses loaded by a class loader are chained through these links
+ Klass* _next_link;
+
+ // The VM's representation of the ClassLoader used to load this class.
+ // Provide access the corresponding instance java.lang.ClassLoader.
+ ClassLoaderData* _class_loader_data;
jint _modifier_flags; // Processed access flags, for use by Class.getModifiers.
AccessFlags _access_flags; // Access flags. The class/interface distinction is stored here.
@@ -257,7 +168,7 @@
int _verify_count; // to avoid redundant verifies
#endif
- juint _alloc_count; // allocation profiling support - update klass_size_in_bytes() if moved/deleted
+ juint _alloc_count; // allocation profiling support
// Biased locking implementation and statistics
// (the 64-bit chunk goes first, to avoid some fragmentation)
@@ -266,50 +177,49 @@
jint _biased_lock_revocation_count;
TRACE_DEFINE_KLASS_TRACE_ID;
- public:
+
+ // Remembered sets support for the oops in the klasses.
+ jbyte _modified_oops; // Card Table Equivalent (YC/CMS support)
+ jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
- // returns the enclosing klassOop
- klassOop as_klassOop() const {
- // see klassOop.hpp for layout.
- return (klassOop) (((char*) this) - sizeof(klassOopDesc));
- }
+ // Constructor
+ Klass();
+
+ void* operator new(size_t size, ClassLoaderData* loader_data, size_t word_size, TRAPS);
public:
- // Allocation
- const Klass_vtbl& vtbl_value() const { return *this; } // used only on "example instances"
- static KlassHandle base_create_klass(KlassHandle& klass, int size, const Klass_vtbl& vtbl, TRAPS);
- static klassOop base_create_klass_oop(KlassHandle& klass, int size, const Klass_vtbl& vtbl, TRAPS);
+ bool is_klass() const volatile { return true; }
// super
- klassOop super() const { return _super; }
- void set_super(klassOop k) { oop_store_without_check((oop*) &_super, (oop) k); }
+ Klass* super() const { return _super; }
+ void set_super(Klass* k) { _super = k; }
// initializes _super link, _primary_supers & _secondary_supers arrays
- void initialize_supers(klassOop k, TRAPS);
- void initialize_supers_impl1(klassOop k);
- void initialize_supers_impl2(klassOop k);
+ void initialize_supers(Klass* k, TRAPS);
+ void initialize_supers_impl1(Klass* k);
+ void initialize_supers_impl2(Klass* k);
// klass-specific helper for initializing _secondary_supers
- virtual objArrayOop compute_secondary_supers(int num_extra_slots, TRAPS);
+ virtual GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots);
// java_super is the Java-level super type as specified by Class.getSuperClass.
- virtual klassOop java_super() const { return NULL; }
+ virtual Klass* java_super() const { return NULL; }
juint super_check_offset() const { return _super_check_offset; }
void set_super_check_offset(juint o) { _super_check_offset = o; }
- klassOop secondary_super_cache() const { return _secondary_super_cache; }
- void set_secondary_super_cache(klassOop k) { oop_store_without_check((oop*) &_secondary_super_cache, (oop) k); }
+ Klass* secondary_super_cache() const { return _secondary_super_cache; }
+ void set_secondary_super_cache(Klass* k) { _secondary_super_cache = k; }
- objArrayOop secondary_supers() const { return _secondary_supers; }
- void set_secondary_supers(objArrayOop k) { oop_store_without_check((oop*) &_secondary_supers, (oop) k); }
+ Array<Klass*>* secondary_supers() const { return _secondary_supers; }
+ void set_secondary_supers(Array<Klass*>* k) { _secondary_supers = k; }
// Return the element of the _super chain of the given depth.
// If there is no such element, return either NULL or this.
- klassOop primary_super_of_depth(juint i) const {
+ Klass* primary_super_of_depth(juint i) const {
assert(i < primary_super_limit(), "oob");
- klassOop super = _primary_supers[i];
- assert(super == NULL || super->klass_part()->super_depth() == i, "correct display");
+ Klass* super = _primary_supers[i];
+ assert(super == NULL || super->super_depth() == i, "correct display");
return super;
}
@@ -326,16 +236,20 @@
if (!can_be_primary_super()) {
return primary_super_limit();
} else {
- juint d = (super_check_offset() - in_bytes(primary_supers_offset())) / sizeof(klassOop);
+ juint d = (super_check_offset() - in_bytes(primary_supers_offset())) / sizeof(Klass*);
assert(d < primary_super_limit(), "oob");
- assert(_primary_supers[d] == as_klassOop(), "proper init");
+ assert(_primary_supers[d] == this, "proper init");
return d;
}
}
+ // store an oop into a field of a Klass
+ void klass_oop_store(oop* p, oop v);
+ void klass_oop_store(volatile oop* p, oop v);
+
// java mirror
oop java_mirror() const { return _java_mirror; }
- void set_java_mirror(oop m) { oop_store((oop*) &_java_mirror, m); }
+ void set_java_mirror(oop m) { klass_oop_store(&_java_mirror, m); }
// modifier flags
jint modifier_flags() const { return _modifier_flags; }
@@ -346,27 +260,38 @@
void set_layout_helper(int lh) { _layout_helper = lh; }
// Note: for instances layout_helper() may include padding.
- // Use instanceKlass::contains_field_offset to classify field offsets.
+ // Use InstanceKlass::contains_field_offset to classify field offsets.
// sub/superklass links
- instanceKlass* superklass() const;
+ InstanceKlass* superklass() const;
Klass* subklass() const;
Klass* next_sibling() const;
void append_to_sibling_list(); // add newly created receiver to superklass' subklass list
void remove_from_sibling_list(); // remove receiver from sibling list
- protected: // internal accessors
- klassOop subklass_oop() const { return _subklass; }
- klassOop next_sibling_oop() const { return _next_sibling; }
- void set_subklass(klassOop s);
- void set_next_sibling(klassOop s);
+
+ void set_next_link(Klass* k) { _next_link = k; }
+ Klass* next_link() const { return _next_link; } // The next klass defined by the class loader.
+
+ // class loader data
+ ClassLoaderData* class_loader_data() const { return _class_loader_data; }
+ void set_class_loader_data(ClassLoaderData* loader_data) { _class_loader_data = loader_data; }
- oop* adr_super() const { return (oop*)&_super; }
- oop* adr_primary_supers() const { return (oop*)&_primary_supers[0]; }
- oop* adr_secondary_super_cache() const { return (oop*)&_secondary_super_cache; }
- oop* adr_secondary_supers()const { return (oop*)&_secondary_supers; }
- oop* adr_java_mirror() const { return (oop*)&_java_mirror; }
- oop* adr_subklass() const { return (oop*)&_subklass; }
- oop* adr_next_sibling() const { return (oop*)&_next_sibling; }
+ // The Klasses are not placed in the Heap, so the Card Table or
+ // the Mod Union Table can't be used to mark when klasses have modified oops.
+ // The CT and MUT bits saves this information for the individual Klasses.
+ void record_modified_oops() { _modified_oops = 1; }
+ void clear_modified_oops() { _modified_oops = 0; }
+ bool has_modified_oops() { return _modified_oops == 1; }
+
+ void accumulate_modified_oops() { if (has_modified_oops()) _accumulated_modified_oops = 1; }
+ void clear_accumulated_modified_oops() { _accumulated_modified_oops = 0; }
+ bool has_accumulated_modified_oops() { return _accumulated_modified_oops == 1; }
+
+ protected: // internal accessors
+ Klass* subklass_oop() const { return _subklass; }
+ Klass* next_sibling_oop() const { return _next_sibling; }
+ void set_subklass(Klass* s);
+ void set_next_sibling(Klass* s);
public:
// Allocation profiling support
@@ -376,15 +301,15 @@
virtual void set_alloc_size(juint n) = 0;
// Compiler support
- static ByteSize super_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _super)); }
- static ByteSize super_check_offset_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _super_check_offset)); }
- static ByteSize primary_supers_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _primary_supers)); }
- static ByteSize secondary_super_cache_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _secondary_super_cache)); }
- static ByteSize secondary_supers_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _secondary_supers)); }
- static ByteSize java_mirror_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _java_mirror)); }
- static ByteSize modifier_flags_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _modifier_flags)); }
- static ByteSize layout_helper_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _layout_helper)); }
- static ByteSize access_flags_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _access_flags)); }
+ static ByteSize super_offset() { return in_ByteSize(offset_of(Klass, _super)); }
+ static ByteSize super_check_offset_offset() { return in_ByteSize(offset_of(Klass, _super_check_offset)); }
+ static ByteSize primary_supers_offset() { return in_ByteSize(offset_of(Klass, _primary_supers)); }
+ static ByteSize secondary_super_cache_offset() { return in_ByteSize(offset_of(Klass, _secondary_super_cache)); }
+ static ByteSize secondary_supers_offset() { return in_ByteSize(offset_of(Klass, _secondary_supers)); }
+ static ByteSize java_mirror_offset() { return in_ByteSize(offset_of(Klass, _java_mirror)); }
+ 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)); }
// Unpacking layout_helper:
enum {
@@ -413,7 +338,7 @@
static bool layout_helper_is_instance(jint lh) {
return (jint)lh > (jint)_lh_neutral_value;
}
- static bool layout_helper_is_javaArray(jint lh) {
+ static bool layout_helper_is_array(jint lh) {
return (jint)lh < (jint)_lh_neutral_value;
}
static bool layout_helper_is_typeArray(jint lh) {
@@ -473,14 +398,12 @@
// vtables
virtual klassVtable* vtable() const { return NULL; }
- static int klass_size_in_bytes() { return offset_of(Klass, _alloc_count) + sizeof(juint); } // all "visible" fields
-
// subclass check
- bool is_subclass_of(klassOop k) const;
+ bool is_subclass_of(Klass* k) const;
// subtype check: true if is_subclass_of, or if k is interface and receiver implements it
- bool is_subtype_of(klassOop k) const {
- juint off = k->klass_part()->super_check_offset();
- klassOop sup = *(klassOop*)( (address)as_klassOop() + off );
+ bool is_subtype_of(Klass* k) const {
+ juint off = k->super_check_offset();
+ Klass* sup = *(Klass**)( (address)this + off );
const juint secondary_offset = in_bytes(secondary_super_cache_offset());
if (sup == k) {
return true;
@@ -490,7 +413,7 @@
return search_secondary_supers(k);
}
}
- bool search_secondary_supers(klassOop k) const;
+ bool search_secondary_supers(Klass* k) const;
// Find LCA in class hierarchy
Klass *LCA( Klass *k );
@@ -500,9 +423,9 @@
virtual void check_valid_for_instantiation(bool throwError, TRAPS);
// Casting
- static Klass* cast(klassOop k) {
+ static Klass* cast(Klass* k) {
assert(k->is_klass(), "cast to Klass");
- return k->klass_part();
+ return k;
}
// array copying
@@ -514,37 +437,39 @@
virtual void initialize(TRAPS);
// lookup operation for MethodLookupCache
friend class MethodLookupCache;
- virtual methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
+ virtual Method* uncached_lookup_method(Symbol* name, Symbol* signature) const;
public:
- methodOop lookup_method(Symbol* name, Symbol* signature) const {
+ Method* lookup_method(Symbol* name, Symbol* signature) const {
return uncached_lookup_method(name, signature);
}
// array class with specific rank
- klassOop array_klass(int rank, TRAPS) { return array_klass_impl(false, rank, THREAD); }
+ Klass* array_klass(int rank, TRAPS) { return array_klass_impl(false, rank, THREAD); }
// array class with this klass as element type
- klassOop array_klass(TRAPS) { return array_klass_impl(false, THREAD); }
+ Klass* array_klass(TRAPS) { return array_klass_impl(false, THREAD); }
// These will return NULL instead of allocating on the heap:
// NB: these can block for a mutex, like other functions with TRAPS arg.
- klassOop array_klass_or_null(int rank);
- klassOop array_klass_or_null();
+ Klass* array_klass_or_null(int rank);
+ Klass* array_klass_or_null();
virtual oop protection_domain() { return NULL; }
- virtual oop class_loader() const { return NULL; }
+
+ oop class_loader() const;
protected:
- virtual klassOop array_klass_impl(bool or_null, int rank, TRAPS);
- virtual klassOop array_klass_impl(bool or_null, TRAPS);
+ virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS);
+ virtual Klass* array_klass_impl(bool or_null, TRAPS);
public:
+ // CDS support - remove and restore oops from metadata. Oops are not shared.
virtual void remove_unshareable_info();
- virtual void shared_symbols_iterate(SymbolClosure* closure);
+ virtual void restore_unshareable_info(TRAPS);
protected:
// computes the subtype relationship
- virtual bool compute_is_subtype_of(klassOop k);
+ virtual bool compute_is_subtype_of(Klass* k);
public:
// subclass accessor (here for convenience; undefined for non-klass objects)
virtual bool is_leaf_class() const { fatal("not a class"); return false; }
@@ -555,8 +480,8 @@
// actual oop size of obj in memory
virtual int oop_size(oop obj) const = 0;
- // actual oop size of this klass in memory
- virtual int klass_oop_size() const = 0;
+ // Size of klass in word size.
+ virtual int size() const = 0;
// Returns the Java name for a class (Resource allocated)
// For arrays, this returns the name of the element with a leading '['.
@@ -577,32 +502,17 @@
// Parallel Scavenge and Parallel Old
PARALLEL_GC_DECLS_PV
+ // type testing operations
+ protected:
+ virtual bool oop_is_instance_slow() const { return false; }
+ virtual bool oop_is_array_slow() const { return false; }
+ virtual bool oop_is_objArray_slow() const { return false; }
+ virtual bool oop_is_typeArray_slow() const { return false; }
public:
- // type testing operations
- virtual bool oop_is_instance_slow() const { return false; }
virtual bool oop_is_instanceMirror() const { return false; }
virtual bool oop_is_instanceRef() const { return false; }
- virtual bool oop_is_array() const { return false; }
- virtual bool oop_is_objArray_slow() const { return false; }
- virtual bool oop_is_klass() const { return false; }
- virtual bool oop_is_thread() const { return false; }
- virtual bool oop_is_method() const { return false; }
- virtual bool oop_is_constMethod() const { return false; }
- virtual bool oop_is_methodData() const { return false; }
- virtual bool oop_is_constantPool() const { return false; }
- virtual bool oop_is_constantPoolCache() const { return false; }
- virtual bool oop_is_typeArray_slow() const { return false; }
- virtual bool oop_is_arrayKlass() const { return false; }
- virtual bool oop_is_objArrayKlass() const { return false; }
- virtual bool oop_is_typeArrayKlass() const { return false; }
- virtual bool oop_is_compiledICHolder() const { return false; }
- virtual bool oop_is_instanceKlass() const { return false; }
- bool oop_is_javaArray_slow() const {
- return oop_is_objArray_slow() || oop_is_typeArray_slow();
- }
-
- // Fast non-virtual versions, used by oop.inline.hpp and elsewhere:
+ // Fast non-virtual versions
#ifndef ASSERT
#define assert_same_query(xval, xcheck) xval
#else
@@ -616,9 +526,9 @@
inline bool oop_is_instance() const { return assert_same_query(
layout_helper_is_instance(layout_helper()),
oop_is_instance_slow()); }
- inline bool oop_is_javaArray() const { return assert_same_query(
- layout_helper_is_javaArray(layout_helper()),
- oop_is_javaArray_slow()); }
+ inline bool oop_is_array() const { return assert_same_query(
+ layout_helper_is_array(layout_helper()),
+ oop_is_array_slow()); }
inline bool oop_is_objArray() const { return assert_same_query(
layout_helper_is_objArray(layout_helper()),
oop_is_objArray_slow()); }
@@ -627,20 +537,6 @@
oop_is_typeArray_slow()); }
#undef assert_same_query
- // Unless overridden, oop is parsable if it has a klass pointer.
- // Parsability of an object is object specific.
- virtual bool oop_is_parsable(oop obj) const { return true; }
-
- // Unless overridden, oop is safe for concurrent GC processing
- // after its allocation is complete. The exception to
- // this is the case where objects are changed after allocation.
- // Class redefinition is one of the known exceptions. During
- // class redefinition, an allocated class can changed in order
- // order to create a merged class (the combiniation of the
- // old class definition that has to be perserved and the new class
- // definition which is being created.
- virtual bool oop_is_conc_safe(oop obj) const { return true; }
-
// Access flags
AccessFlags access_flags() const { return _access_flags; }
void set_access_flags(AccessFlags flags) { _access_flags = flags; }
@@ -677,7 +573,7 @@
// are potential problems in setting the bias pattern for
// JVM-internal oops.
inline void set_prototype_header(markOop header);
- static ByteSize prototype_header_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(Klass, _prototype_header)); }
+ static ByteSize prototype_header_offset() { return in_ByteSize(offset_of(Klass, _prototype_header)); }
int biased_lock_revocation_count() const { return (int) _biased_lock_revocation_count; }
// Atomically increments biased_lock_revocation_count and returns updated value
@@ -689,8 +585,14 @@
TRACE_DEFINE_KLASS_METHODS;
// garbage collection support
- virtual void follow_weak_klass_links(
- BoolObjectClosure* is_alive, OopClosure* keep_alive);
+ virtual void oops_do(OopClosure* cl);
+
+ // Checks if the class loader is alive.
+ // Iff the class loader is alive the Klass is considered alive.
+ // The is_alive closure passed in depends on the Garbage Collector used.
+ bool is_loader_alive(BoolObjectClosure* is_alive);
+
+ static void clean_weak_klass_links(BoolObjectClosure* is_alive);
// Prefetch within oop iterators. This is a macro because we
// can't guarantee that the compiler will inline it. In 64-bit
@@ -723,15 +625,15 @@
}
// iterators
- virtual int oop_oop_iterate(oop obj, OopClosure* blk) = 0;
- virtual int oop_oop_iterate_v(oop obj, OopClosure* blk) {
+ virtual int oop_oop_iterate(oop obj, ExtendedOopClosure* blk) = 0;
+ virtual int oop_oop_iterate_v(oop obj, ExtendedOopClosure* blk) {
return oop_oop_iterate(obj, blk);
}
#ifndef SERIALGC
// In case we don't have a specialized backward scanner use forward
// iteration.
- virtual int oop_oop_iterate_backwards_v(oop obj, OopClosure* blk) {
+ virtual int oop_oop_iterate_backwards_v(oop obj, ExtendedOopClosure* blk) {
return oop_oop_iterate_v(obj, blk);
}
#endif // !SERIALGC
@@ -740,8 +642,8 @@
// (I don't see why the _m should be required, but without it the Solaris
// C++ gives warning messages about overridings of the "oop_oop_iterate"
// defined above "hiding" this virtual function. (DLD, 6/20/00)) */
- virtual int oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) = 0;
- virtual int oop_oop_iterate_v_m(oop obj, OopClosure* blk, MemRegion mr) {
+ virtual int oop_oop_iterate_m(oop obj, ExtendedOopClosure* blk, MemRegion mr) = 0;
+ virtual int oop_oop_iterate_v_m(oop obj, ExtendedOopClosure* blk, MemRegion mr) {
return oop_oop_iterate_m(obj, blk, mr);
}
@@ -778,8 +680,8 @@
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(Klass_OOP_OOP_ITERATE_BACKWARDS_DECL)
#endif // !SERIALGC
- virtual void array_klasses_do(void f(klassOop k)) {}
- virtual void with_array_klasses_do(void f(klassOop k));
+ virtual void array_klasses_do(void f(Klass* k)) {}
+ virtual void with_array_klasses_do(void f(Klass* k));
// Return self, except for abstract classes with exactly 1
// implementor. Then return the 1 concrete implementation.
@@ -789,8 +691,6 @@
Symbol* name() const { return _name; }
void set_name(Symbol* n);
- friend class klassKlass;
-
public:
// jvm support
virtual jint compute_modifier_flags(TRAPS) const;
@@ -799,23 +699,27 @@
virtual jint jvmti_class_status() const;
// Printing
+ virtual void print_on(outputStream* st) const;
+
virtual void oop_print_value_on(oop obj, outputStream* st);
virtual void oop_print_on (oop obj, outputStream* st);
+ virtual const char* internal_name() const = 0;
+
// Verification
- virtual const char* internal_name() const = 0;
- virtual void oop_verify_on(oop obj, outputStream* st);
- // tells whether obj is partially constructed (gc during class loading)
- virtual bool oop_partially_loaded(oop obj) const { return false; }
- virtual void oop_set_partially_loaded(oop obj) {};
+ virtual void verify_on(outputStream* st);
+ void verify() { verify_on(tty); }
#ifndef PRODUCT
void verify_vtable_index(int index);
#endif
+
+ virtual void oop_verify_on(oop obj, outputStream* st);
+
+ private:
+ // barriers used by klass_oop_store
+ void klass_update_barrier_set(oop v);
+ void klass_update_barrier_set_pre(void* p, oop v);
};
-
-inline oop klassOopDesc::java_mirror() const { return klass_part()->java_mirror(); }
-
-
#endif // SHARE_VM_OOPS_KLASS_HPP