mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
Merge
This commit is contained in:
commit
a23cbf5b96
152 changed files with 2411 additions and 502 deletions
|
@ -1352,39 +1352,39 @@ bool VM_RedefineClasses::rewrite_cp_refs(instanceKlassHandle scratch_class,
|
|||
|
||||
// rewrite constant pool references in the methods:
|
||||
if (!rewrite_cp_refs_in_methods(scratch_class, THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
|
||||
// rewrite constant pool references in the class_annotations:
|
||||
if (!rewrite_cp_refs_in_class_annotations(scratch_class, THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
|
||||
// rewrite constant pool references in the fields_annotations:
|
||||
if (!rewrite_cp_refs_in_fields_annotations(scratch_class, THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
|
||||
// rewrite constant pool references in the methods_annotations:
|
||||
if (!rewrite_cp_refs_in_methods_annotations(scratch_class, THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
|
||||
// rewrite constant pool references in the methods_parameter_annotations:
|
||||
if (!rewrite_cp_refs_in_methods_parameter_annotations(scratch_class,
|
||||
THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
|
||||
// rewrite constant pool references in the methods_default_annotations:
|
||||
if (!rewrite_cp_refs_in_methods_default_annotations(scratch_class,
|
||||
THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1603,7 +1603,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_annotations_typeArray(
|
|||
byte_i_ref, THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad annotation_struct at %d", calc_num_annotations));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -1669,7 +1669,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_annotation_struct(
|
|||
byte_i_ref, THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad element_value at %d", calc_num_element_value_pairs));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
} // end for each component
|
||||
|
@ -1818,7 +1818,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_element_value(
|
|||
// field. This is a nested annotation.
|
||||
if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray,
|
||||
byte_i_ref, THREAD)) {
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
@ -1845,7 +1845,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_element_value(
|
|||
annotations_typeArray, byte_i_ref, THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad nested element_value at %d", calc_num_values));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -1889,7 +1889,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_fields_annotations(
|
|||
THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad field_annotations at %d", i));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -1926,7 +1926,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_methods_annotations(
|
|||
THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad method_annotations at %d", i));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -1994,7 +1994,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_methods_parameter_annotations(
|
|||
method_parameter_annotations, byte_i, THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad method_parameter_annotations at %d", calc_num_parameters));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -2044,7 +2044,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_methods_default_annotations(
|
|||
method_default_annotations, byte_i, THREAD)) {
|
||||
RC_TRACE_WITH_THREAD(0x02000000, THREAD,
|
||||
("bad default element_value at %d", i));
|
||||
// propogate failure back to caller
|
||||
// propagate failure back to caller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue