--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-02 12:37:36.868310029 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-02 12:37:36.748310034 +0200
@@ -2622,23 +2622,19 @@
   return result;
 }
 
-Space* G1CollectedHeap::space_containing(const void* addr) const {
-  return heap_region_containing(addr);
-}
-
 HeapWord* G1CollectedHeap::block_start(const void* addr) const {
-  Space* sp = space_containing(addr);
-  return sp->block_start(addr);
+  HeapRegion* hr = heap_region_containing(addr);
+  return hr->block_start(addr);
 }
 
 size_t G1CollectedHeap::block_size(const HeapWord* addr) const {
-  Space* sp = space_containing(addr);
-  return sp->block_size(addr);
+  HeapRegion* hr = heap_region_containing(addr);
+  return hr->block_size(addr);
 }
 
 bool G1CollectedHeap::block_is_obj(const HeapWord* addr) const {
-  Space* sp = space_containing(addr);
-  return sp->block_is_obj(addr);
+  HeapRegion* hr = heap_region_containing(addr);
+  return hr->block_is_obj(addr);
 }
 
 bool G1CollectedHeap::supports_tlab_allocation() const {
--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2015-04-02 12:37:37.124310019 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	2015-04-02 12:37:37.008310023 +0200
@@ -1303,10 +1303,6 @@
 
   HeapRegion* next_compaction_region(const HeapRegion* from) const;
 
-  // A CollectedHeap will contain some number of spaces.  This finds the
-  // space containing a given address, or else returns NULL.
-  Space* space_containing(const void* addr) const;
-
   // Returns the HeapRegion that contains addr. addr must not be NULL.
   template <class T>
   inline HeapRegion* heap_region_containing_raw(const T addr) const;