diff -r 24c446b2460d -r b7c8142a9e0b src/share/vm/gc_implementation/g1/concurrentMark.hpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Wed Apr 08 10:32:16 2015 -0400
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Wed Apr 15 12:16:01 2015 -0400
@@ -1112,6 +1112,8 @@
   // mark bitmap scan, and so needs to be pushed onto the mark stack.
   bool is_below_finger(HeapWord* objAddr, HeapWord* global_finger) const;
 
+  template<bool scan> void process_grey_object(oop obj);
+
 public:
   // It resets the task; it should be called right at the beginning of
   // a marking phase.
@@ -1164,7 +1166,7 @@
   inline void deal_with_reference(oop obj);
 
   // It scans an object and visits its children.
-  void scan_object(oop obj);
+  void scan_object(oop obj) { process_grey_object<true>(obj); }
 
   // It pushes an object on the local queue.
   inline void push(oop obj);