archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8007320: NPG: move method annotations

Browse source 
Allocate method annotations and attach to ConstMethod if present

Reviewed-by: dcubed, jiangli, sspitsyn, iklam
This commit is contained in:
Coleen Phillimore 2013-02-11 14:06:22 -05:00
parent ee53020f94
commit faea95b8d3
19 changed files with 862 additions and 838 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hotspot/src/share/vm/oops/instanceKlass.hpp
View file

@ -155,8 +155,8 @@ class InstanceKlass: public Klass {
ReferenceType rt,
AccessFlags access_flags,
Symbol* name,
Klass* super_klass,
KlassHandle host_klass,
Klass* super_klass,
bool is_anonymous,
TRAPS);
InstanceKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
@ -679,19 +679,19 @@ class InstanceKlass: public Klass {
// 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()->class_annotations();
return (_annotations != NULL) ? _annotations->class_annotations() : NULL;
}
Array<AnnotationArray*>* fields_annotations() const {
if (annotations() == NULL) return NULL;
return annotations()->fields_annotations();
return (_annotations != NULL) ? _annotations->fields_annotations() : NULL;
}
Annotations* type_annotations() const {
if (annotations() == NULL) return NULL;
return annotations()->type_annotations();
AnnotationArray* class_type_annotations() const {
return (_annotations != NULL) ? _annotations->class_type_annotations() : NULL;
}
Array<AnnotationArray*>* fields_type_annotations() const {
return (_annotations != NULL) ? _annotations->fields_type_annotations() : NULL;
}
// allocation
instanceOop allocate_instance(TRAPS);
@ -810,6 +810,7 @@ class InstanceKlass: public Klass {
// 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) {
@ -847,10 +848,14 @@ class InstanceKlass: public Klass {
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() +
nonstatic_oop_map_count());
return (Klass**)end_of_nonstatic_oop_maps();
} else {
return NULL;
}
@ -862,8 +867,7 @@ class InstanceKlass: public Klass {
if (adr_impl != NULL) {
return adr_impl + 1;
} else {
return (Klass**)(start_of_nonstatic_oop_maps() +
nonstatic_oop_map_count());
return end_of_nonstatic_oop_maps();
}
} else {
return NULL;