--- old/src/hotspot/share/classfile/stringTable.hpp	2018-06-04 17:06:50.806498481 +0200
+++ new/src/hotspot/share/classfile/stringTable.hpp	2018-06-04 17:06:50.376484056 +0200
@@ -71,9 +71,9 @@
   OopStorage* _weak_handles;
 
   volatile size_t _items;
-  DEFINE_PAD_MINUS_SIZE(1, 64, sizeof(volatile size_t));
+  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile size_t));
   volatile size_t _uncleaned_items;
-  DEFINE_PAD_MINUS_SIZE(2, 64, sizeof(volatile size_t));
+  DEFINE_PAD_MINUS_SIZE(2, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile size_t));
 
   double get_load_factor();
   double get_dead_factor();
@@ -146,19 +146,21 @@
     { return StringTable::the_table()->_needs_rehashing; }
 
   // Sharing
-  oop lookup_shared(jchar* name, int len, unsigned int hash);
+ private:
+  oop lookup_shared(jchar* name, int len, unsigned int hash) NOT_CDS_JAVA_HEAP_RETURN_(NULL);
+  static void copy_shared_string_table(CompactStringTableWriter* ch_table) NOT_CDS_JAVA_HEAP_RETURN;
+ public:
   static oop create_archived_string(oop s, Thread* THREAD);
   static void set_shared_string_mapped() { _shared_string_mapped = true; }
   static bool shared_string_mapped()       { return _shared_string_mapped; }
   static void shared_oops_do(OopClosure* f) NOT_CDS_JAVA_HEAP_RETURN;
-  static void copy_shared_string(CompactStringTableWriter* ch_table)
-    NOT_CDS_JAVA_HEAP_RETURN;
   static void write_to_archive() NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
 
   // Jcmd
   static void dump(outputStream* st, bool verbose=false);
   // Debugging
+  static size_t verify_and_compare_entries();
   static void verify();
 };