--- old/src/share/vm/oops/instanceKlass.hpp	2016-09-06 18:50:52.065654890 -0400
+++ new/src/share/vm/oops/instanceKlass.hpp	2016-09-06 18:50:51.201605550 -0400
@@ -777,7 +777,7 @@
   void set_cached_class_file(JvmtiCachedClassFileData *data) {
     _cached_class_file = data;
   }
-  JvmtiCachedClassFileData * get_cached_class_file() { return _cached_class_file; }
+  JvmtiCachedClassFileData * get_cached_class_file();
   jint get_cached_class_file_len();
   unsigned char * get_cached_class_file_bytes();
 
@@ -801,6 +801,14 @@
 
 #endif // INCLUDE_JVMTI
 
+#if INCLUDE_CDS && INCLUDE_JVMTI
+  void set_archived_class_data(JvmtiCachedClassFileData* data) {
+    _cached_class_file = data;
+  }
+
+  JvmtiCachedClassFileData * get_archived_class_data();
+#endif
+
   bool has_default_methods() const {
     return (_misc_flags & _misc_has_default_methods) != 0;
   }