src/share/vm/classfile/stringTable.cpp

@@ -38,12 +38,12 @@
 #include "runtime/mutexLocker.hpp"
 #include "utilities/hashtable.inline.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1CollectedHeap.hpp"
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
 #include "gc/g1/g1StringDedup.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #endif
 
 // the number of buckets a thread claims
 const int ClaimChunkSize = 32;
 

@@ -191,11 +191,11 @@
   // A lookup in the StringTable could return an object that was previously
   // considered dead. The SATB part of G1 needs to get notified about this
   // potential resurrection, otherwise the marking might not find the object.
 #if INCLUDE_ALL_GCS
   if (UseG1GC && string != NULL) {
-    G1SATBCardTableModRefBS::enqueue(string);
+    SATBMarkQueue::enqueue(string);
   }
 #endif
 }
 
 oop StringTable::lookup(jchar* name, int len) {