--- old/src/hotspot/share/classfile/stringTable.cpp	2018-05-29 11:09:43.624256989 +0200
+++ new/src/hotspot/share/classfile/stringTable.cpp	2018-05-29 11:09:43.211243009 +0200
@@ -434,19 +434,6 @@
   _par_state_string->oops_do(f);
 }
 
-void StringTable::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) {
-  assert(is_alive != NULL, "No closure");
-  StringTableIsAliveCounter stiac(is_alive);
-  weak_storage()->weak_oops_do(is_alive, f);
-  StringTable::the_table()->items_to_clean(stiac._count);
-  StringTable::the_table()->check_concurrent_work();
-}
-
-void StringTable::weak_oops_do(OopClosure* f) {
-  assert(f != NULL, "No closure");
-  weak_storage()->weak_oops_do(f);
-}
-
 struct StringTableDeleteCheck {
   long _count;
   long _item;
--- old/src/hotspot/share/classfile/stringTable.hpp	2018-05-29 11:09:44.760295445 +0200
+++ new/src/hotspot/share/classfile/stringTable.hpp	2018-05-29 11:09:44.339281194 +0200
@@ -117,23 +117,19 @@
   static void unlink(BoolObjectClosure* cl) {
     unlink_or_oops_do(cl);
   }
-  static void unlink_or_oops_do(BoolObjectClosure* is_alive,
-                                OopClosure* f = NULL, int* processed = NULL,
-                                int* removed = NULL);
+  static void unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f = NULL,
+                                int* processed = NULL, int* removed = NULL);
 
   // Serially invoke "f->do_oop" on the locations of all oops in the table.
   static void oops_do(OopClosure* f);
 
   // Possibly parallel versions of the above
   static void possibly_parallel_unlink(
-     OopStorage::ParState<false /* concurrent */, false /* const*/>*
-     _par_state_string, BoolObjectClosure* cl, int* processed, int* removed);
+     OopStorage::ParState<false /* concurrent */, false /* const*/>* par_state_string,
+     BoolObjectClosure* cl, int* processed, int* removed);
   static void possibly_parallel_oops_do(
-     OopStorage::ParState<false /* concurrent */, false /* const*/>*
-     _par_state_string,OopClosure* f);
-
-  static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f);
-  static void weak_oops_do(OopClosure* f);
+     OopStorage::ParState<false /* concurrent */, false /* const*/>* par_state_string,
+     OopClosure* f);
 
   // Probing
   static oop lookup(Symbol* symbol);
@@ -147,7 +143,7 @@
   // Rehash the string table if it gets out of balance
   static void rehash_table();
   static bool needs_rehashing()
-  { return StringTable::the_table()->_needs_rehashing; }
+    { return StringTable::the_table()->_needs_rehashing; }
 
   // Sharing
   oop lookup_shared(jchar* name, int len, unsigned int hash);