truffle: src/share/vm/oops/instanceKlass.hpp comparison

comparison src/share/vm/oops/instanceKlass.hpp @ 8124:5fc51c1ecdeb

Merge.

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Tue, 05 Mar 2013 23:44:54 +0100
parents	3ac7d10a6572 927a311d00f9
children	b8f261ba79c6

comparison

equal deleted inserted replaced

-:a413bcd552a4
+:5fc51c1ecdeb
 /*
-* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #include "runtime/atomic.hpp"
 #include "runtime/handles.hpp"
 #include "runtime/os.hpp"
 #include "utilities/accessFlags.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/macros.hpp"
 // An InstanceKlass is the VM level representation of a Java class.
 // It contains all information needed for at class at execution runtime.
 //  InstanceKlass layout:
 int static_field_size,
 int nonstatic_oop_map_size,
 ReferenceType rt,
 AccessFlags access_flags,
 Symbol* name,
 Klass* super_klass,
-KlassHandle host_klass,
+bool is_anonymous,
 TRAPS);
 InstanceKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
 // See "The Java Virtual Machine Specification" section 2.16.2-5 for a detailed description
 // InstanceKlass. See PreviousVersionWalker below.
 GrowableArray<PreviousVersionNode *>* _previous_versions;
 // 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
+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
+u1              _reference_type;                // reference type
 JvmtiCachedClassFieldMap* _jvmti_cached_class_field_map;  // JVMTI: used during heap iteration
 // Method array.
 Array<Method*>* _methods;
 // Interface (Klass*s) this class declares locally to implement.
 //     [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
-u1              _reference_type;                // reference type
 // embedded Java vtable follows here
 // embedded Java itables follows here
 // embedded static fields follows here
 // embedded nonstatic oop-map blocks follows here
 // embedded implementor of this interface follows here
 int cached_itable_index(size_t idnum);
 // annotations support
 Annotations* annotations() const          { return _annotations; }
 void set_annotations(Annotations* anno)   { _annotations = anno; }
 AnnotationArray* class_annotations() const {
-if (annotations() == NULL) return NULL;
+return (_annotations != NULL) ? _annotations->class_annotations() : NULL;
-return annotations()->class_annotations();
 }
 Array<AnnotationArray*>* fields_annotations() const {
-if (annotations() == NULL) return NULL;
+return (_annotations != NULL) ? _annotations->fields_annotations() : NULL;
-return annotations()->fields_annotations();
+}
-}
+AnnotationArray* class_type_annotations() const {
-Annotations* type_annotations() const {
+return (_annotations != NULL) ? _annotations->class_type_annotations() : NULL;
-if (annotations() == NULL) return NULL;
+}
-return annotations()->type_annotations();
+Array<AnnotationArray*>* fields_type_annotations() const {
-}
+return (_annotations != NULL) ? _annotations->fields_type_annotations() : NULL;
+}
 // allocation
 instanceOop allocate_instance(TRAPS);
 // additional member function to return a handle
 instanceHandle allocate_instance_handle(TRAPS)      { return instanceHandle(THREAD, allocate_instance(THREAD)); }
 return (super() == NULL) ? NULL : cast(super());
 }
 // Sizing (in words)
 static int header_size()            { return align_object_offset(sizeof(InstanceKlass)/HeapWordSize); }
 static int size(int vtable_length, int itable_length,
 int nonstatic_oop_map_size,
 bool is_interface, bool is_anonymous) {
 return align_object_size(header_size() +
 align_object_offset(vtable_length) +
 itable_length(),
 nonstatic_oop_map_size(),
 is_interface(),
 is_anonymous());
 }
+#if INCLUDE_SERVICES
+virtual void collect_statistics(KlassSizeStats *sz) const;
+#endif
 static int vtable_start_offset()    { return header_size(); }
 static int vtable_length_offset()   { return offset_of(InstanceKlass, _vtable_len) / HeapWordSize; }
 intptr_t* start_of_vtable() const        { return ((intptr_t*)this) + vtable_start_offset(); }
 OopMapBlock* start_of_nonstatic_oop_maps() const {
 return (OopMapBlock*)(start_of_itable() + align_object_offset(itable_length()));
 }
+Klass** end_of_nonstatic_oop_maps() const {
+return (Klass**)(start_of_nonstatic_oop_maps() +
+nonstatic_oop_map_count());
+}
 Klass** adr_implementor() const {
 if (is_interface()) {
-return (Klass**)(start_of_nonstatic_oop_maps() +
+return (Klass**)end_of_nonstatic_oop_maps();
-nonstatic_oop_map_count());
 } else {
 return NULL;
 }
 };
 if (is_anonymous()) {
 Klass** adr_impl = adr_implementor();
 if (adr_impl != NULL) {
 return adr_impl + 1;
 } else {
-return (Klass**)(start_of_nonstatic_oop_maps() +
+return end_of_nonstatic_oop_maps();
-nonstatic_oop_map_count());
 }
 } else {
 return NULL;
 }
 }
 MemRegion mr);
 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DECL)
 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DECL)
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
 #define InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix) \
 int  oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* blk);
 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DECL)
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
 u2 idnum_allocated_count() const      { return _idnum_allocated_count; }
 private:
 // initialization state
 #ifdef ASSERT

Mercurial > hg > truffle

comparison src/share/vm/oops/instanceKlass.hpp @ 8124:5fc51c1ecdeb