--- old/src/share/vm/gc/shared/genOopClosures.hpp	2016-01-13 23:35:23.260590000 +0100
+++ new/src/share/vm/gc/shared/genOopClosures.hpp	2016-01-13 23:35:23.096574000 +0100
@@ -146,23 +146,15 @@
   HeapWord*   _boundary;
   ExtendedOopClosure* _cl;
  protected:
-  template <class T> inline void do_oop_work(T* p) {
-    T heap_oop = oopDesc::load_heap_oop(p);
-    if (!oopDesc::is_null(heap_oop)) {
-      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-      if ((HeapWord*)obj < _boundary) {
-        _cl->do_oop(p);
-      }
-    }
-  }
+  template <class T> inline void do_oop_work(T* p);
  public:
   FilteringClosure(HeapWord* boundary, ExtendedOopClosure* cl) :
     ExtendedOopClosure(cl->ref_processor()), _boundary(boundary),
     _cl(cl) {}
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
-  inline void do_oop_nv(oop* p)       { FilteringClosure::do_oop_work(p); }
-  inline void do_oop_nv(narrowOop* p) { FilteringClosure::do_oop_work(p); }
+  inline void do_oop_nv(oop* p);
+  inline void do_oop_nv(narrowOop* p);
   virtual bool do_metadata()          { return do_metadata_nv(); }
   inline bool do_metadata_nv()        { assert(!_cl->do_metadata(), "assumption broken, must change to 'return _cl->do_metadata()'"); return false; }
 };