--- a/src/hotspot/share/runtime/safepoint.cpp	Mon May 20 09:43:46 2019 -0400
+++ b/src/hotspot/share/runtime/safepoint.cpp	Mon May 20 10:06:07 2019 -0400
@@ -516,6 +516,8 @@
   if (ObjectSynchronizer::is_cleanup_needed()) return true;
   // Need a safepoint if some inline cache buffers is non-empty
   if (!InlineCacheBuffer::is_empty()) return true;
+  if (StringTable::needs_rehashing()) return true;
+  if (SymbolTable::needs_rehashing()) return true;
   return false;
 }