--- old/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp	2018-03-26 12:40:03.887468289 +0200
+++ new/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp	2018-03-26 12:40:03.630460438 +0200
@@ -161,9 +161,10 @@
   inline void do_oop_partial_array(oop* p);
 
   // This method is applied to the fields of the objects that have just been copied.
-  template <class T> inline void do_oop_evac(T* p, HeapRegion* from);
+  template <class T> inline void do_oop_evac(T* p);
 
-  template <class T> inline void deal_with_reference(T* ref_to_scan);
+  inline void deal_with_reference(oop* ref_to_scan);
+  inline void deal_with_reference(narrowOop* ref_to_scan);
 
   inline void dispatch_reference(StarTask ref);