Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > hotspot

changeset 7444:e94e32873b55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More fixes for G1: make markRange() nonvirtual (not needed). Declare is_obj_ill() as const, so that G1CollectedHeap can override it.
author Roman Kennke <rkennke@redhat.com>
date Sat, 13 Dec 2014 00:14:54 +0100
parents 52aeb8fe98ca
children 1dac30aedd40
files src/share/vm/gc_implementation/shared/cmBitMap.hpp src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp src/share/vm/memory/sharedHeap.cpp src/share/vm/memory/sharedHeap.hpp
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shared/cmBitMap.hpp	Sat Dec 13 00:14:52 2014 +0100
+++ b/src/share/vm/gc_implementation/shared/cmBitMap.hpp	Sat Dec 13 00:14:54 2014 +0100
@@ -93,7 +93,7 @@
   inline bool parMark(HeapWord* addr);
   inline bool parClear(HeapWord* addr);
 
-  virtual void markRange(MemRegion mr);
+  void markRange(MemRegion mr);
   void parMarkRange(MemRegion mr);
   void clearRange(MemRegion mr);
 
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp	Sat Dec 13 00:14:52 2014 +0100
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp	Sat Dec 13 00:14:54 2014 +0100
@@ -226,7 +226,7 @@
   ReferenceProcessor* _ref_processor_cm;
   bool is_marked_prev(oop obj) const;
 
-  bool is_obj_ill(const oop obj) {
+  bool is_obj_ill(const oop obj) const {
     return !isMarkedCurrent(obj);
   }
 
--- a/src/share/vm/memory/sharedHeap.cpp	Sat Dec 13 00:14:52 2014 +0100
+++ b/src/share/vm/memory/sharedHeap.cpp	Sat Dec 13 00:14:54 2014 +0100
@@ -335,6 +335,6 @@
              proper_unit_for_byte_size(capacity));
 }
 
-bool SharedHeap::is_obj_ill(const oop obj) {
+bool SharedHeap::is_obj_ill(const oop obj) const {
   return false;
 }
--- a/src/share/vm/memory/sharedHeap.hpp	Sat Dec 13 00:14:52 2014 +0100
+++ b/src/share/vm/memory/sharedHeap.hpp	Sat Dec 13 00:14:54 2014 +0100
@@ -291,7 +291,7 @@
                              size_t bytes_after,
                              size_t capacity);
 
-  virtual bool is_obj_ill(const oop obj);
+  virtual bool is_obj_ill(const oop obj) const;
 };
 
 inline SharedHeap::ScanningOption operator|(SharedHeap::ScanningOption so0, SharedHeap::ScanningOption so1) {