src/share/vm/prims/jvmtiClassFileReconstituter.cpp

rev 6869 : 8057043: Type annotations not retained during class redefine / retransform
Reviewed-by: coleenp, sspitsyn, jfranck

*** 52,61 ****
--- 52,62 ----
  // JVMSpec|     u2 fields_count;
  // JVMSpec|     field_info fields[fields_count];
  void JvmtiClassFileReconstituter::write_field_infos() {
    HandleMark hm(thread());
    Array<AnnotationArray*>* fields_anno = ikh()->fields_annotations();
+   Array<AnnotationArray*>* fields_type_anno = ikh()->fields_type_annotations();
  
    // Compute the real number of Java fields
    int java_fields = ikh()->java_fields_count();
  
    write_u2(java_fields);
*** 66,75 ****
--- 67,77 ----
      int initial_value_index = fs.initval_index();
      guarantee(name_index != 0 && signature_index != 0, "bad constant pool index for field");
      // int offset = ikh()->field_offset( index );
      int generic_signature_index = fs.generic_signature_index();
      AnnotationArray* anno = fields_anno == NULL ? NULL : fields_anno->at(fs.index());
+     AnnotationArray* type_anno = fields_type_anno == NULL ? NULL : fields_type_anno->at(fs.index());
  
      // JVMSpec|   field_info {
      // JVMSpec|         u2 access_flags;
      // JVMSpec|         u2 name_index;
      // JVMSpec|         u2 descriptor_index;
*** 91,100 ****
--- 93,105 ----
        ++attr_count;
      }
      if (anno != NULL) {
        ++attr_count;     // has RuntimeVisibleAnnotations attribute
      }
+     if (type_anno != NULL) {
+       ++attr_count;     // has RuntimeVisibleTypeAnnotations attribute
+     }
  
      write_u2(attr_count);
  
      if (initial_value_index != 0) {
        write_attribute_name_index("ConstantValue");
*** 108,117 ****
--- 113,125 ----
        write_signature_attribute(generic_signature_index);
      }
      if (anno != NULL) {
        write_annotations_attribute("RuntimeVisibleAnnotations", anno);
      }
+     if (type_anno != NULL) {
+       write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
+     }
    }
  }
  
  // Write Code attribute
  // JVMSpec|   Code_attribute {
*** 548,557 ****
--- 556,566 ----
    ConstMethod* const_method = method->constMethod();
    u2 generic_signature_index = const_method->generic_signature_index();
    AnnotationArray* anno = method->annotations();
    AnnotationArray* param_anno = method->parameter_annotations();
    AnnotationArray* default_anno = method->annotation_default();
+   AnnotationArray* type_anno = method->type_annotations();
  
    // skip generated default interface methods
    if (method->is_overpass()) {
      return;
    }
*** 583,592 ****
--- 592,604 ----
      ++attr_count;     // has RuntimeVisibleAnnotations attribute
    }
    if (param_anno != NULL) {
      ++attr_count;     // has RuntimeVisibleParameterAnnotations attribute
    }
+   if (type_anno != NULL) {
+     ++attr_count;     // has RuntimeVisibleTypeAnnotations attribute
+   }
  
    write_u2(attr_count);
    if (const_method->code_size() > 0) {
      write_code_attribute(method);
    }
*** 607,625 ****
--- 619,641 ----
      write_annotations_attribute("RuntimeVisibleAnnotations", anno);
    }
    if (param_anno != NULL) {
      write_annotations_attribute("RuntimeVisibleParameterAnnotations", param_anno);
    }
+   if (type_anno != NULL) {
+     write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
+   }
  }
  
  // Write the class attributes portion of ClassFile structure
  // JVMSpec|     u2 attributes_count;
  // JVMSpec|     attribute_info attributes[attributes_count];
  void JvmtiClassFileReconstituter::write_class_attributes() {
    u2 inner_classes_length = inner_classes_attribute_length();
    Symbol* generic_signature = ikh()->generic_signature();
    AnnotationArray* anno = ikh()->class_annotations();
+   AnnotationArray* type_anno = ikh()->class_type_annotations();
  
    int attr_count = 0;
    if (generic_signature != NULL) {
      ++attr_count;
    }
*** 633,642 ****
--- 649,661 ----
      ++attr_count;
    }
    if (anno != NULL) {
      ++attr_count;     // has RuntimeVisibleAnnotations attribute
    }
+   if (type_anno != NULL) {
+     ++attr_count;     // has RuntimeVisibleTypeAnnotations attribute
+   }
    if (cpool()->operands() != NULL) {
      ++attr_count;
    }
  
    write_u2(attr_count);
*** 654,663 ****
--- 673,685 ----
      write_inner_classes_attribute(inner_classes_length);
    }
    if (anno != NULL) {
      write_annotations_attribute("RuntimeVisibleAnnotations", anno);
    }
+   if (type_anno != NULL) {
+     write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
+   }
    if (cpool()->operands() != NULL) {
      write_bootstrapmethod_attribute();
    }
  }