src/hotspot/share/memory/metaspaceShared.cpp

*** 1942,1952 ****
  
  oop MetaspaceShared::materialize_archived_object(narrowOop v) {
    assert(archive_heap_region_fixed(),
           "must be called after archive heap regions are fixed");
    if (!CompressedOops::is_null(v)) {
!     oop obj = HeapShared::decode_with_archived_oop_encoding_mode(v);
      return G1CollectedHeap::heap()->materialize_archived_object(obj);
    }
    return NULL;
  }
  
--- 1942,1952 ----
  
  oop MetaspaceShared::materialize_archived_object(narrowOop v) {
    assert(archive_heap_region_fixed(),
           "must be called after archive heap regions are fixed");
    if (!CompressedOops::is_null(v)) {
!     oop obj = HeapShared::decode_from_archive(v);
      return G1CollectedHeap::heap()->materialize_archived_object(obj);
    }
    return NULL;
  }
  
*** 2019,2029 ****
      } else {
        assert(MetaspaceShared::is_heap_object_archiving_allowed(),
               "Archived heap object is not allowed");
        assert(MetaspaceShared::open_archive_heap_region_mapped(),
               "Open archive heap region is not mapped");
!       *p = HeapShared::decode_with_archived_oop_encoding_mode(o);
      }
    }
  
    void do_region(u_char* start, size_t size) {
      assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
--- 2019,2029 ----
      } else {
        assert(MetaspaceShared::is_heap_object_archiving_allowed(),
               "Archived heap object is not allowed");
        assert(MetaspaceShared::open_archive_heap_region_mapped(),
               "Open archive heap region is not mapped");
!       *p = HeapShared::decode_from_archive(o);
      }
    }
  
    void do_region(u_char* start, size_t size) {
      assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");