--- a/hotspot/src/share/vm/oops/method.cpp Wed Dec 19 10:35:08 2012 -0800
+++ b/hotspot/src/share/vm/oops/method.cpp Thu Dec 20 10:22:19 2012 +0100
@@ -1331,13 +1331,15 @@
Array<AnnotationArray*>* methods_annotations,
Array<AnnotationArray*>* methods_parameter_annotations,
Array<AnnotationArray*>* methods_default_annotations,
+ Array<AnnotationArray*>* methods_type_annotations,
bool idempotent) {
int length = methods->length();
if (length > 1) {
bool do_annotations = false;
if (methods_annotations != NULL ||
methods_parameter_annotations != NULL ||
- methods_default_annotations != NULL) {
+ methods_default_annotations != NULL ||
+ methods_type_annotations != NULL) {
do_annotations = true;
}
if (do_annotations) {
@@ -1356,6 +1358,7 @@
assert(methods_annotations == NULL || methods_annotations->length() == methods->length(), "");
assert(methods_parameter_annotations == NULL || methods_parameter_annotations->length() == methods->length(), "");
assert(methods_default_annotations == NULL || methods_default_annotations->length() == methods->length(), "");
+ assert(methods_type_annotations == NULL || methods_type_annotations->length() == methods->length(), "");
if (do_annotations) {
ResourceMark rm;
// Allocate temporary storage
@@ -1363,6 +1366,7 @@
reorder_based_on_method_index(methods, methods_annotations, temp_array);
reorder_based_on_method_index(methods, methods_parameter_annotations, temp_array);
reorder_based_on_method_index(methods, methods_default_annotations, temp_array);
+ reorder_based_on_method_index(methods, methods_type_annotations, temp_array);
}
// Reset method ordering