src/hotspot/share/cds/aotMapLogger.cpp

*** 490,11 ***
      os::print_hex_dump(&lsh, base, top, unitsize, /* print_ascii=*/true, /* bytes_per_line=*/32, requested_base);
    }
  }
  
  #if INCLUDE_CDS_JAVA_HEAP
! // FakeOop (and subclasses FakeMirror, FakeString, FakeObjArray, FakeTypeArray) are used to traverse
  // and print the (image of) heap objects stored in the AOT cache. These objects are different than regular oops:
  // - They do not reside inside the range of the heap.
  // - For +UseCompressedOops: pointers may use a different narrowOop encoding: see FakeOop::read_oop_at(narrowOop*)
  // - For -UseCompressedOops: pointers are not direct: see FakeOop::read_oop_at(oop*)
  //
--- 490,11 ---
      os::print_hex_dump(&lsh, base, top, unitsize, /* print_ascii=*/true, /* bytes_per_line=*/32, requested_base);
    }
  }
  
  #if INCLUDE_CDS_JAVA_HEAP
! // FakeOop (and subclasses FakeMirror, FakeString, FakeRefArray, FakeFlatArray, FakeTypeArray) are used to traverse
  // and print the (image of) heap objects stored in the AOT cache. These objects are different than regular oops:
  // - They do not reside inside the range of the heap.
  // - For +UseCompressedOops: pointers may use a different narrowOop encoding: see FakeOop::read_oop_at(narrowOop*)
  // - For -UseCompressedOops: pointers are not direct: see FakeOop::read_oop_at(oop*)
  //

*** 528,11 ***
  
    FakeOop() : _data() {}
    FakeOop(OopDataIterator* iter, OopData data) : _iter(iter), _data(data) {}
  
    FakeMirror as_mirror();
!   FakeObjArray as_obj_array();
    FakeString as_string();
    FakeTypeArray as_type_array();
  
    RequestedMetadataAddr klass() {
      address rk = (address)real_klass();
--- 528,12 ---
  
    FakeOop() : _data() {}
    FakeOop(OopDataIterator* iter, OopData data) : _iter(iter), _data(data) {}
  
    FakeMirror as_mirror();
!   FakeRefArray as_ref_array();
+   FakeFlatArray as_flat_array();
    FakeString as_string();
    FakeTypeArray as_type_array();
  
    RequestedMetadataAddr klass() {
      address rk = (address)real_klass();

*** 616,29 ***
    int static_oop_field_count() {
      return java_lang_Class::static_oop_field_count(raw_oop());
    }
  }; // AOTMapLogger::FakeMirror
  
! class AOTMapLogger::FakeObjArray : public AOTMapLogger::FakeOop {
!   objArrayOop raw_objArrayOop() {
!     return (objArrayOop)raw_oop();
    }
  
  public:
!   FakeObjArray(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
  
    int length() {
!     return raw_objArrayOop()->length();
    }
    FakeOop obj_at(int i) {
      if (UseCompressedOops) {
!       return read_oop_at(raw_objArrayOop()->obj_at_addr<narrowOop>(i));
      } else {
!       return read_oop_at(raw_objArrayOop()->obj_at_addr<oop>(i));
      }
    }
! }; // AOTMapLogger::FakeObjArray
  
  class AOTMapLogger::FakeString : public AOTMapLogger::FakeOop {
  public:
    FakeString(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
  
--- 617,46 ---
    int static_oop_field_count() {
      return java_lang_Class::static_oop_field_count(raw_oop());
    }
  }; // AOTMapLogger::FakeMirror
  
! class AOTMapLogger::FakeRefArray : public AOTMapLogger::FakeOop {
!   refArrayOop raw_refArrayOop() {
!     return (refArrayOop)raw_oop();
    }
  
  public:
!   FakeRefArray(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
  
    int length() {
!     return raw_refArrayOop()->length();
    }
    FakeOop obj_at(int i) {
      if (UseCompressedOops) {
!       return read_oop_at(raw_refArrayOop()->obj_at_addr<narrowOop>(i));
      } else {
!       return read_oop_at(raw_refArrayOop()->obj_at_addr<oop>(i));
      }
    }
! }; // AOTMapLogger::FakeRefArray
+ 
+ class AOTMapLogger::FakeFlatArray : public AOTMapLogger::FakeOop {
+   flatArrayOop raw_flatArrayOop() {
+     return (flatArrayOop)raw_oop();
+   }
+ 
+ public:
+   FakeFlatArray(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
+ 
+   int length() {
+     return raw_flatArrayOop()->length();
+   }
+   void print_elements_on(outputStream* st) {
+     FlatArrayKlass::cast(real_klass())->oop_print_elements_on(raw_flatArrayOop(), st);
+   }
+ 
+ }; // AOTMapLogger::FakeRefArray
  
  class AOTMapLogger::FakeString : public AOTMapLogger::FakeOop {
  public:
    FakeString(OopDataIterator* iter, OopData data) : FakeOop(iter, data) {}
  

*** 674,13 ***
  AOTMapLogger::FakeMirror AOTMapLogger::FakeOop::as_mirror() {
    precond(real_klass() == vmClasses::Class_klass());
    return FakeMirror(_iter, _data);
  }
  
! AOTMapLogger::FakeObjArray AOTMapLogger::FakeOop::as_obj_array() {
!   precond(real_klass()->is_objArray_klass());
!   return FakeObjArray(_iter, _data);
  }
  
  AOTMapLogger::FakeTypeArray AOTMapLogger::FakeOop::as_type_array() {
    precond(real_klass()->is_typeArray_klass());
    return FakeTypeArray(_iter, _data);
--- 692,18 ---
  AOTMapLogger::FakeMirror AOTMapLogger::FakeOop::as_mirror() {
    precond(real_klass() == vmClasses::Class_klass());
    return FakeMirror(_iter, _data);
  }
  
! AOTMapLogger::FakeRefArray AOTMapLogger::FakeOop::as_ref_array() {
!   precond(real_klass()->is_refArray_klass());
!   return FakeRefArray(_iter, _data);
+ }
+ 
+ AOTMapLogger::FakeFlatArray AOTMapLogger::FakeOop::as_flat_array() {
+   precond(real_klass()->is_flatArray_klass());
+   return FakeFlatArray(_iter, _data);
  }
  
  AOTMapLogger::FakeTypeArray AOTMapLogger::FakeOop::as_type_array() {
    precond(real_klass()->is_typeArray_klass());
    return FakeTypeArray(_iter, _data);

*** 921,12 ***
    st->print(" " PTR_FORMAT, p2i(fake_oop.klass().raw_addr()));
    st->cr();
  
    if (real_klass->is_typeArray_klass()) {
      fake_oop.as_type_array().print_elements_on(st);
!   } else if (real_klass->is_objArray_klass()) {
!     FakeObjArray fake_obj_array = fake_oop.as_obj_array();
      bool is_logging_root_segment = fake_oop.is_root_segment();
  
      for (int i = 0; i < fake_obj_array.length(); i++) {
        FakeOop elm = fake_obj_array.obj_at(i);
        if (is_logging_root_segment) {
--- 944,16 ---
    st->print(" " PTR_FORMAT, p2i(fake_oop.klass().raw_addr()));
    st->cr();
  
    if (real_klass->is_typeArray_klass()) {
      fake_oop.as_type_array().print_elements_on(st);
!   } else if (real_klass->is_flatArray_klass()) {
!     // Archiving FlatArrayOop with embedded oops is not supported.
+     // TODO: add restriction.
+     fake_oop.as_flat_array().print_elements_on(st);
+   } else if (real_klass->is_refArray_klass()) {
+     FakeRefArray fake_obj_array = fake_oop.as_ref_array();
      bool is_logging_root_segment = fake_oop.is_root_segment();
  
      for (int i = 0; i < fake_obj_array.length(); i++) {
        FakeOop elm = fake_obj_array.obj_at(i);
        if (is_logging_root_segment) {