--- old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2015-04-02 12:35:42.020314827 +0200
+++ new/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2015-04-02 12:35:41.932314830 +0200
@@ -2442,11 +2442,10 @@
   {
     VerifyAllOopsClosure cl(_collector, this, span, past_remark,
       _collector->markBitMap());
-    CollectedHeap* ch = Universe::heap();
 
     // Iterate over all oops in the heap. Uses the _no_header version
     // since we are not interested in following the klass pointers.
-    ch->oop_iterate_no_header(&cl);
+    GenCollectedHeap::heap()->oop_iterate_no_header(&cl);
   }
 
   if (VerifyObjectStartArray) {
--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-02 12:35:42.252314817 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-02 12:35:42.132314822 +0200
@@ -2467,11 +2467,6 @@
   }
 };
 
-void G1CollectedHeap::oop_iterate(ExtendedOopClosure* cl) {
-  IterateOopClosureRegionClosure blk(cl);
-  heap_region_iterate(&blk);
-}
-
 // Iterates an ObjectClosure over all objects within a HeapRegion.
 
 class IterateObjectClosureRegionClosure: public HeapRegionClosure {
--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2015-04-02 12:35:42.504314807 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2015-04-02 12:35:42.392314811 +0200
@@ -1254,10 +1254,6 @@
 
   // Iteration functions.
 
-  // Iterate over all the ref-containing fields of all objects, calling
-  // "cl.do_oop" on each.
-  virtual void oop_iterate(ExtendedOopClosure* cl);
-
   // Iterate over all objects, calling "cl.do_object" on each.
   virtual void object_iterate(ObjectClosure* cl);
 
--- old/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	2015-04-02 12:35:42.684314799 +0200
+++ new/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	2015-04-02 12:35:42.600314803 +0200
@@ -516,10 +516,6 @@
   VMThread::execute(&op);
 }
 
-void ParallelScavengeHeap::oop_iterate(ExtendedOopClosure* cl) {
-  Unimplemented();
-}
-
 void ParallelScavengeHeap::object_iterate(ObjectClosure* cl) {
   young_gen()->object_iterate(cl);
   old_gen()->object_iterate(cl);
--- old/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	2015-04-02 12:35:42.856314792 +0200
+++ new/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	2015-04-02 12:35:42.768314796 +0200
@@ -201,7 +201,6 @@
   // initializing stores to an object at this address.
   virtual bool can_elide_initializing_store_barrier(oop new_obj);
 
-  void oop_iterate(ExtendedOopClosure* cl);
   void object_iterate(ObjectClosure* cl);
   void safe_object_iterate(ObjectClosure* cl) { object_iterate(cl); }
 
--- old/src/share/vm/gc_interface/collectedHeap.hpp	2015-04-02 12:35:43.036314784 +0200
+++ new/src/share/vm/gc_interface/collectedHeap.hpp	2015-04-02 12:35:42.924314789 +0200
@@ -498,12 +498,6 @@
   // Return the CollectorPolicy for the heap
   virtual CollectorPolicy* collector_policy() const = 0;
 
-  void oop_iterate_no_header(OopClosure* cl);
-
-  // Iterate over all the ref-containing fields of all objects, calling
-  // "cl.do_oop" on each.
-  virtual void oop_iterate(ExtendedOopClosure* cl) = 0;
-
   // Iterate over all objects, calling "cl.do_object" on each.
   virtual void object_iterate(ObjectClosure* cl) = 0;
 
--- old/src/share/vm/gc_interface/collectedHeap.inline.hpp	2015-04-02 12:35:43.236314776 +0200
+++ new/src/share/vm/gc_interface/collectedHeap.inline.hpp	2015-04-02 12:35:43.128314781 +0200
@@ -236,12 +236,6 @@
   return (oop)obj;
 }
 
-inline void CollectedHeap::oop_iterate_no_header(OopClosure* cl) {
-  NoHeaderExtendedOopClosure no_header_cl(cl);
-  oop_iterate(&no_header_cl);
-}
-
-
 inline HeapWord* CollectedHeap::align_allocation_or_fail(HeapWord* addr,
                                                          HeapWord* end,
                                                          unsigned short alignment_in_bytes) {
--- old/src/share/vm/memory/genCollectedHeap.cpp	2015-04-02 12:35:43.436314768 +0200
+++ new/src/share/vm/memory/genCollectedHeap.cpp	2015-04-02 12:35:43.324314772 +0200
@@ -924,6 +924,11 @@
 }
 #endif
 
+void GenCollectedHeap::oop_iterate_no_header(OopClosure* cl) {
+  NoHeaderExtendedOopClosure no_header_cl(cl);
+  oop_iterate(&no_header_cl);
+}
+
 void GenCollectedHeap::oop_iterate(ExtendedOopClosure* cl) {
   _young_gen->oop_iterate(cl);
   _old_gen->oop_iterate(cl);
--- old/src/share/vm/memory/genCollectedHeap.hpp	2015-04-02 12:35:43.640314759 +0200
+++ new/src/share/vm/memory/genCollectedHeap.hpp	2015-04-02 12:35:43.528314764 +0200
@@ -223,6 +223,7 @@
   }
 
   // Iteration functions.
+  void oop_iterate_no_header(OopClosure* cl);
   void oop_iterate(ExtendedOopClosure* cl);
   void object_iterate(ObjectClosure* cl);
   void safe_object_iterate(ObjectClosure* cl);