--- old/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	2018-03-26 12:40:02.791434807 +0200
+++ new/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	2018-03-26 12:40:02.504426039 +0200
@@ -247,7 +247,7 @@
       forwardee = _par_scan_state->copy_to_survivor_space(state, obj, m);
     }
     assert(forwardee != NULL, "forwardee should not be NULL");
-    RawAccess<>::oop_store(p, forwardee);
+    RawAccess<OOP_NOT_NULL>::oop_store(p, forwardee);
     if (do_mark_object != G1MarkNone && forwardee != obj) {
       // If the object is self-forwarded we don't need to explicitly
       // mark it, the evacuation failure protocol will do so.