# HG changeset patch
# User Roman Kennke <rkennke@redhat.com>
# Date 1418426094 -3600
# Node ID e94e32873b55689e94bc169f52e4de85a14ec341
# Parent  52aeb8fe98ca4d8a08ed2c7eb865f518d537fcb4
More fixes for G1: make markRange() nonvirtual (not needed). Declare is_obj_ill() as const, so that G1CollectedHeap can override it.

diff -r 52aeb8fe98ca -r e94e32873b55 src/share/vm/gc_implementation/shared/cmBitMap.hpp
--- 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);
 
diff -r 52aeb8fe98ca -r e94e32873b55 src/share/vm/gc_implementation/shenandoah/shenandoahHeap.hpp
--- 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);
   }
 
diff -r 52aeb8fe98ca -r e94e32873b55 src/share/vm/memory/sharedHeap.cpp
--- 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;
 }
diff -r 52aeb8fe98ca -r e94e32873b55 src/share/vm/memory/sharedHeap.hpp
--- 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) {