--- old/src/hotspot/share/oops/oop.inline.hpp	2018-10-23 12:02:43.121054079 +0200
+++ new/src/hotspot/share/oops/oop.inline.hpp	2018-10-23 12:02:42.702041032 +0200
@@ -371,6 +371,8 @@
 }
 
 oop oopDesc::forward_to_atomic(oop p, markOop compare, atomic_memory_order order) {
+  // CMS forwards some non-heap value into the mark oop to reserve oops during
+  // promotion, so the next two asserts do not hold.
   assert(UseConcMarkSweepGC || check_obj_alignment(p),
          "forwarding to something not aligned");
   assert(UseConcMarkSweepGC || Universe::heap()->is_in_reserved(p),