--- old/src/share/vm/gc/serial/markSweep.inline.hpp	2017-08-08 17:48:53.336094525 -0400
+++ new/src/share/vm/gc/serial/markSweep.inline.hpp	2017-08-08 17:48:51.255976300 -0400
@@ -26,6 +26,7 @@
 #define SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
 
 #include "gc/serial/markSweep.hpp"
+#include "memory/metaspaceShared.hpp"
 #include "memory/universe.hpp"
 #include "oops/markOop.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -33,6 +34,22 @@
 #include "gc/g1/g1Allocator.inline.hpp"
 #endif // INCLUDE_ALL_GCS
 
+inline bool MarkSweep::is_closed_archive_object(oop object) {
+#if INCLUDE_ALL_GCS
+  return G1ArchiveAllocator::is_closed_archive_object(object);
+#else
+  return false;
+#endif
+}
+
+inline bool MarkSweep::is_open_archive_object(oop object) {
+#if INCLUDE_ALL_GCS
+  return G1ArchiveAllocator::is_open_archive_object(object);
+#else
+  return false;
+#endif
+}
+
 inline bool MarkSweep::is_archive_object(oop object) {
 #if INCLUDE_ALL_GCS
   return G1ArchiveAllocator::is_archive_object(object);
@@ -52,14 +69,24 @@
     assert(Universe::heap()->is_in(obj), "should be in heap");
 
     oop new_obj = oop(obj->mark()->decode_pointer());
-    assert(is_archive_object(obj) ||                  // no forwarding of archive objects
+
+    assert(is_archive_object(obj) ||             // no forwarding of archive objects
            new_obj != NULL ||                         // is forwarding ptr?
            obj->mark() == markOopDesc::prototype() || // not gc marked?
            (UseBiasedLocking && obj->mark()->has_bias_pattern()),
            // not gc marked?
            "should be forwarded");
+
+#ifndef PRODUCT
+    // open_archive objects are marked by GC. Their mark should
+    // not have forwarding ptr.
+    if (is_open_archive_object(obj)) {
+      assert(new_obj == NULL, "archive heap object has forwarding ptr");
+    }
+#endif
+
     if (new_obj != NULL) {
-      if (!is_archive_object(obj)) {
+      if (!is_closed_archive_object(obj)) {
         assert(Universe::heap()->is_in_reserved(new_obj),
               "should be in object space");
         oopDesc::encode_store_heap_oop_not_null(p, new_obj);