--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Apr 10 10:55:07 2015 -0400
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Sun Apr 12 14:59:41 2015 +0200
@@ -1346,9 +1346,6 @@
   // the block is an object.
   virtual bool block_is_obj(const HeapWord* addr) const;
 
-  // Does this heap support heap inspection? (+PrintClassHistogram)
-  virtual bool supports_heap_inspection() const { return true; }
-
   // Section on thread-local allocation buffers (TLABs)
   // See CollectedHeap for semantics.
 

--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Fri Apr 10 10:55:07 2015 -0400
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Sun Apr 12 14:59:41 2015 +0200
@@ -132,9 +132,6 @@
   // the young gen.
   virtual bool is_scavengable(const void* addr);
 
-  // Does this heap support heap inspection? (+PrintClassHistogram)
-  bool supports_heap_inspection() const { return true; }
-
   size_t max_capacity() const;
 
   // Whether p is in the allocated part of the heap

--- a/src/share/vm/gc_implementation/shared/vmGCOperations.cpp	Fri Apr 10 10:55:07 2015 -0400
+++ b/src/share/vm/gc_implementation/shared/vmGCOperations.cpp	Sun Apr 12 14:59:41 2015 +0200
@@ -128,16 +128,7 @@
   release_and_notify_pending_list_lock();
 }
 
-bool VM_GC_HeapInspection::doit_prologue() {
-  if (Universe::heap()->supports_heap_inspection()) {
-    return VM_GC_Operation::doit_prologue();
-  } else {
-    return false;
-  }
-}
-
 bool VM_GC_HeapInspection::skip_operation() const {
-  assert(Universe::heap()->supports_heap_inspection(), "huh?");
   return false;
 }
 

--- a/src/share/vm/gc_implementation/shared/vmGCOperations.hpp	Fri Apr 10 10:55:07 2015 -0400
+++ b/src/share/vm/gc_implementation/shared/vmGCOperations.hpp	Sun Apr 12 14:59:41 2015 +0200
@@ -150,7 +150,6 @@
   ~VM_GC_HeapInspection() {}
   virtual VMOp_Type type() const { return VMOp_GC_HeapInspection; }
   virtual bool skip_operation() const;
-  virtual bool doit_prologue();
   virtual void doit();
   void set_csv_format(bool value) {_csv_format = value;}
   void set_print_help(bool value) {_print_help = value;}

--- a/src/share/vm/gc_interface/collectedHeap.hpp	Fri Apr 10 10:55:07 2015 -0400
+++ b/src/share/vm/gc_interface/collectedHeap.hpp	Sun Apr 12 14:59:41 2015 +0200
@@ -450,9 +450,6 @@
   // remembered set.
   virtual void flush_deferred_store_barrier(JavaThread* thread);
 
-  // Does this heap support heap inspection (+PrintClassHistogram?)
-  virtual bool supports_heap_inspection() const = 0;
-
   // Perform a collection of the heap; intended for use in implementing
   // "System.gc".  This probably implies as full a collection as the
   // "CollectedHeap" supports.

--- a/src/share/vm/memory/genCollectedHeap.hpp	Fri Apr 10 10:55:07 2015 -0400
+++ b/src/share/vm/memory/genCollectedHeap.hpp	Sun Apr 12 14:59:41 2015 +0200
@@ -177,9 +177,6 @@
   HeapWord** top_addr() const;
   HeapWord** end_addr() const;
 
-  // Does this heap support heap inspection? (+PrintClassHistogram)
-  virtual bool supports_heap_inspection() const { return true; }
-
   // Perform a full collection of the heap; intended for use in implementing
   // "System.gc". This implies as full a collection as the CollectedHeap
   // supports. Caller does not hold the Heap_lock on entry.