--- old/src/hotspot/share/classfile/compactHashtable.cpp	2018-09-19 14:45:01.632653654 -0700
+++ new/src/hotspot/share/classfile/compactHashtable.cpp	2018-09-19 14:45:01.392644604 -0700
@@ -35,6 +35,7 @@
 #include "utilities/numberSeq.hpp"
 #include <sys/stat.h>
 
+#if INCLUDE_CDS
 /////////////////////////////////////////////////////
 //
 // The compact hash table writer implementations
@@ -180,6 +181,7 @@
   soc->do_ptr((void**)&_buckets);
   soc->do_ptr((void**)&_entries);
 }
+#endif // INCLUDE_CDS
 
 #ifndef O_BINARY       // if defined (Win32) use binary files.
 #define O_BINARY 0     // otherwise do nothing.
--- old/src/hotspot/share/classfile/compactHashtable.hpp	2018-09-19 14:45:02.112671756 -0700
+++ new/src/hotspot/share/classfile/compactHashtable.hpp	2018-09-19 14:45:01.876662857 -0700
@@ -50,6 +50,7 @@
   int bucket_bytes;
 };
 
+#if INCLUDE_CDS
 /////////////////////////////////////////////////////////////////////////
 //
 // The compact hash table writer. Used at dump time for writing out
@@ -123,6 +124,7 @@
 public:
   void dump(SimpleCompactHashtable *cht, const char* table_name);
 };
+#endif // INCLUDE_CDS
 
 #define REGULAR_BUCKET_TYPE       0
 #define VALUE_ONLY_BUCKET_TYPE    1
@@ -212,7 +214,7 @@
   }
 
   // For reading from/writing to the CDS archive
-  void serialize(SerializeClosure* soc);
+  void serialize(SerializeClosure* soc) NOT_CDS_RETURN;
 
   inline bool empty() {
     return (_entry_count == 0);