--- a/hotspot/src/share/vm/gc/serial/markSweep.cpp	Mon Aug 14 16:48:44 2017 +0200
+++ b/hotspot/src/share/vm/gc/serial/markSweep.cpp	Mon Aug 14 14:32:17 2017 -0400
@@ -87,7 +87,7 @@
   if (!oopDesc::is_null(heap_oop)) {
     oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
     if (!obj->mark()->is_marked() &&
-        !is_archive_object(obj)) {
+        !is_closed_archive_object(obj)) {
       mark_object(obj);
       _marking_stack.push(obj);
     }
@@ -184,7 +184,7 @@
   if (!oopDesc::is_null(heap_oop)) {
     oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
     if (!obj->mark()->is_marked() &&
-        !is_archive_object(obj)) {
+        !is_closed_archive_object(obj)) {
       mark_object(obj);
       follow_object(obj);
     }
@@ -268,7 +268,7 @@
 
 MarkSweep::IsAliveClosure   MarkSweep::is_alive;
 
-bool MarkSweep::IsAliveClosure::do_object_b(oop p) { return p->is_gc_marked() || is_archive_object(p); }
+bool MarkSweep::IsAliveClosure::do_object_b(oop p) { return p->is_gc_marked() || is_closed_archive_object(p); }
 
 MarkSweep::KeepAliveClosure MarkSweep::keep_alive;