stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8009531: Crash when redefining class with annotated method

Browse Source 
Neglected to copy the annotations in clone_with_new_data when they were moved to ConstMethod.

Reviewed-by: acorn, sspitsyn, dcubed
This commit is contained in:
Coleen Phillimore 2013-03-27 08:19:50 -04:00
parent 087b089a1f
commit 878c7e4cd0
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hotspot/src/share/vm/oops/constMethod.cpp
View File

@ -363,6 +363,26 @@ AnnotationArray** ConstMethod::default_annotations_addr() const {
return (AnnotationArray**)constMethod_end() - offset;
}
// copy annotations from 'cm' to 'this'
void ConstMethod::copy_annotations_from(ConstMethod* cm) {
if (cm->has_method_annotations()) {
assert(has_method_annotations(), "should be allocated already");
set_method_annotations(cm->method_annotations());
}
if (cm->has_parameter_annotations()) {
assert(has_parameter_annotations(), "should be allocated already");
set_parameter_annotations(cm->parameter_annotations());
}
if (cm->has_type_annotations()) {
assert(has_type_annotations(), "should be allocated already");
set_type_annotations(cm->type_annotations());
}
if (cm->has_default_annotations()) {
assert(has_default_annotations(), "should be allocated already");
set_default_annotations(cm->default_annotations());
}
}
// Printing
void ConstMethod::print_on(outputStream* st) const {

3
hotspot/src/share/vm/oops/constMethod.hpp
View File

@ -441,6 +441,9 @@ public:
return has_default_annotations() ? default_annotations()->length() : 0;
}
// Copy annotations from other ConstMethod
void copy_annotations_from(ConstMethod* cm);
// byte codes
void set_code(address code) {
if (code_size() > 0) {

2
hotspot/src/share/vm/oops/method.cpp
View File

@ -1170,6 +1170,8 @@ methodHandle Method::clone_with_new_data(methodHandle m, u_char* new_code, int n
newm->set_stackmap_data(stackmap_data);
}
// copy annotations over to new method
newcm->copy_annotations_from(cm);
return newm;
}