--- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp	Mon Apr 09 08:19:26 2018 -0400
+++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp	Thu Apr 05 10:54:53 2018 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
 }
 
 inline void PreservedMarks::init_forwarded_mark(oop obj) {
-  obj->init_mark();
+  obj->init_mark_raw();
 }
 
 inline void PreservedMarksSet::restore(RestorePreservedMarksTaskExecutor* executor) {
@@ -78,4 +78,8 @@
              // cache size to 0.
              0 /* max_cache_size */) { }
 
+void PreservedMarks::OopAndMarkOop::set_mark() const {
+  _o->set_mark_raw(_m);
+}
+
 #endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP