< prev index next >

src/hotspot/share/gc/z/zLiveMap.inline.hpp

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -90,11 +90,11 @@
 inline BitMap::idx_t ZLiveMap::segment_size() const {
   return _bitmap.size() / nsegments;
 }
 
 inline BitMap::idx_t ZLiveMap::index_to_segment(BitMap::idx_t index) const {
-  return index >> _segment_shift;
+  return index >> _shift;
 }
 
 inline bool ZLiveMap::get(size_t index) const {
   BitMap::idx_t segment = index_to_segment(index);
   return is_marked() &&              // Page is marked

@@ -142,11 +142,11 @@
   while (index < end_index) {
     // Calculate object address
     const uintptr_t addr = page_start + ((index / 2) << page_object_alignment_shift);
 
     // Apply closure
-    cl->do_object(ZOop::from_address(addr));
+    cl->do_object(ZOop::to_oop(addr));
 
     // Find next bit after this object
     const size_t size = ZUtils::object_size(addr);
     const uintptr_t next_addr = align_up(addr + size, 1 << page_object_alignment_shift);
     const BitMap::idx_t next_index = ((next_addr - page_start) >> page_object_alignment_shift) * 2;
< prev index next >