--- a/src/hotspot/share/gc/cms/parNewGeneration.hpp	Fri Aug 16 09:18:41 2019 +0200
+++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp	Tue Aug 06 10:48:21 2019 +0200
@@ -381,7 +381,7 @@
   // that must not contain a forwarding pointer (though one might be
   // inserted in "obj"s mark word by a parallel thread).
   oop copy_to_survivor_space(ParScanThreadState* par_scan_state,
-                             oop obj, size_t obj_sz, markOop m);
+                             oop obj, size_t obj_sz, markWord m);
 
   // in support of testing overflow code
   NOT_PRODUCT(int _overflow_counter;)