src/share/vm/gc/g1/g1StringDedupTable.cpp

rev 12906 : [mq]: gc_interface

*** 24,34 ****
  
  #include "precompiled.hpp"
  #include "classfile/altHashing.hpp"
  #include "classfile/javaClasses.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/g1StringDedup.hpp"
  #include "gc/g1/g1StringDedupTable.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "logging/log.hpp"
  #include "memory/padded.inline.hpp"
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "classfile/altHashing.hpp"
  #include "classfile/javaClasses.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
! #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1StringDedup.hpp"
  #include "gc/g1/g1StringDedupTable.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "logging/log.hpp"
  #include "memory/padded.inline.hpp"
*** 380,390 ****
    stat.inc_new(size_in_bytes);
  
    if (existing_value != NULL) {
      // Enqueue the reference to make sure it is kept alive. Concurrent mark might
      // otherwise declare it dead if there are no other strong references to this object.
!     G1SATBCardTableModRefBS::enqueue(existing_value);
  
      // Existing value found, deduplicate string
      java_lang_String::set_value(java_string, existing_value);
  
      if (G1CollectedHeap::heap()->is_in_young(value)) {
--- 380,390 ----
    stat.inc_new(size_in_bytes);
  
    if (existing_value != NULL) {
      // Enqueue the reference to make sure it is kept alive. Concurrent mark might
      // otherwise declare it dead if there are no other strong references to this object.
!     G1BarrierSet::satb_enqueue(existing_value);
  
      // Existing value found, deduplicate string
      java_lang_String::set_value(java_string, existing_value);
  
      if (G1CollectedHeap::heap()->is_in_young(value)) {