--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Fri Oct 13 14:02:01 2017 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Fri Oct 13 15:08:56 2017 +0200
@@ -1282,8 +1282,6 @@
 
   inline bool is_in_young(const oop obj);
 
-  virtual bool is_scavengable(const void* addr);
-
   // We don't need barriers for initializing stores to objects
   // in the young gen: for the SATB pre-barrier, there is no
   // pre-value that needs to be remembered; for the remembered-set
@@ -1395,6 +1393,9 @@
 
   // Optimized nmethod scanning support routines
 
+  // Is an oop scavengeable
+  virtual bool is_scavengable(oop obj);
+
   // Register the given nmethod with the G1 heap.
   virtual void register_nmethod(nmethod* nm);