diff -r 057f21a10f5f -r 7dad333205cd hotspot/src/share/vm/oops/oop.cpp
--- a/hotspot/src/share/vm/oops/oop.cpp	Mon Aug 14 16:48:44 2017 +0200
+++ b/hotspot/src/share/vm/oops/oop.cpp	Mon Aug 14 14:32:17 2017 -0400
@@ -31,6 +31,9 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/copy.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc/g1/g1Allocator.inline.hpp"
+#endif
 
 bool always_do_update_barrier = false;
 
@@ -138,3 +141,9 @@
   // Only has a klass gap when compressed class pointers are used.
   return UseCompressedClassPointers;
 }
+
+#if INCLUDE_CDS_JAVA_HEAP
+bool oopDesc::is_archive_object(oop p) {
+  return (p == NULL) ? false : G1ArchiveAllocator::is_archive_object(p);
+}
+#endif