changeset 4610:c456f4510385

8008453: JvmtiClassFileReconstituter does not recognize default methods Reviewed-by: acorn, sspitsyn
author sla
date Fri, 03 May 2013 12:24:11 +0200
parents 8fe2542bdc8d
children 0380df7c3cd0
files src/share/vm/prims/jvmtiClassFileReconstituter.cpp
diffstat 1 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Wed May 01 09:00:39 2013 -0700
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Fri May 03 12:24:11 2013 +0200
@@ -513,6 +513,11 @@
   AnnotationArray* param_anno = method->parameter_annotations();
   AnnotationArray* default_anno = method->annotation_default();
 
+  // skip generated default interface methods
+  if (method->is_overpass()) {
+    return;
+  }
+
   write_u2(access_flags.get_flags() & JVM_RECOGNIZED_METHOD_MODIFIERS);
   write_u2(const_method->name_index());
   write_u2(const_method->signature_index());
@@ -619,8 +624,19 @@
   HandleMark hm(thread());
   Array<Method*>* methods = ikh()->methods();
   int num_methods = methods->length();
+  int num_overpass = 0;
 
-  write_u2(num_methods);
+  // count the generated default interface methods
+  // these will not be re-created by write_method_info
+  // and should not be included in the total count
+  for (int index = 0; index < num_methods; index++) {
+    Method* method = methods->at(index);
+    if (method->is_overpass()) {
+      num_overpass++;
+    }
+  }
+
+  write_u2(num_methods - num_overpass);
   if (JvmtiExport::can_maintain_original_method_order()) {
     int index;
     int original_index;