src/share/vm/runtime/safepoint.cpp

@@ -181,11 +181,11 @@
 #if INCLUDE_ALL_GCS
   if (UseConcMarkSweepGC) {
     // In the future we should investigate whether CMS can use the
     // more-general mechanism below.  DLD (01/05).
     ConcurrentMarkSweepThread::synchronize(false);
-  } else if (UseG1GC) {
+  } else if (UseG1GC || (UseShenandoahGC && UseStringDeduplication)) {
     SuspendibleThreadSet::synchronize();
   }
 #endif // INCLUDE_ALL_GCS
 
   // By getting the Threads_lock, we assure that no threads are about to start or

@@ -587,11 +587,11 @@
   }
 #if INCLUDE_ALL_GCS
   // If there are any concurrent GC threads resume them.
   if (UseConcMarkSweepGC) {
     ConcurrentMarkSweepThread::desynchronize(false);
-  } else if (UseG1GC) {
+  } else if (UseG1GC || (UseShenandoahGC && UseStringDeduplication)) {
     SuspendibleThreadSet::desynchronize();
   }
 #endif // INCLUDE_ALL_GCS
   // record this time so VMThread can keep track how much time has elasped
   // since last safepoint.