src/share/vm/gc_implementation/g1/g1StringDedup.cpp

rev 7800 : [mq]: cleanupOopInlineHpp

*** 21,31 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
! #include "classfile/javaClasses.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1GCPhaseTimes.hpp"
  #include "gc_implementation/g1/g1StringDedup.hpp"
  #include "gc_implementation/g1/g1StringDedupQueue.hpp"
  #include "gc_implementation/g1/g1StringDedupStat.hpp"
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
! #include "classfile/javaClasses.inline.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1GCPhaseTimes.hpp"
  #include "gc_implementation/g1/g1StringDedup.hpp"
  #include "gc_implementation/g1/g1StringDedupQueue.hpp"
  #include "gc_implementation/g1/g1StringDedupStat.hpp"
*** 49,59 ****
    assert(is_enabled(), "String deduplication not enabled");
    G1StringDedupThread::stop();
  }
  
  bool G1StringDedup::is_candidate_from_mark(oop obj) {
!   if (java_lang_String::is_instance(obj)) {
      bool from_young = G1CollectedHeap::heap()->heap_region_containing_raw(obj)->is_young();
      if (from_young && obj->age() < StringDeduplicationAgeThreshold) {
        // Candidate found. String is being evacuated from young to old but has not
        // reached the deduplication age threshold, i.e. has not previously been a
        // candidate during its life in the young generation.
--- 49,59 ----
    assert(is_enabled(), "String deduplication not enabled");
    G1StringDedupThread::stop();
  }
  
  bool G1StringDedup::is_candidate_from_mark(oop obj) {
!   if (java_lang_String::is_instance_inlined(obj)) {
      bool from_young = G1CollectedHeap::heap()->heap_region_containing_raw(obj)->is_young();
      if (from_young && obj->age() < StringDeduplicationAgeThreshold) {
        // Candidate found. String is being evacuated from young to old but has not
        // reached the deduplication age threshold, i.e. has not previously been a
        // candidate during its life in the young generation.
*** 71,81 ****
      G1StringDedupQueue::push(0 /* worker_id */, java_string);
    }
  }
  
  bool G1StringDedup::is_candidate_from_evacuation(bool from_young, bool to_young, oop obj) {
!   if (from_young && java_lang_String::is_instance(obj)) {
      if (to_young && obj->age() == StringDeduplicationAgeThreshold) {
        // Candidate found. String is being evacuated from young to young and just
        // reached the deduplication age threshold.
        return true;
      }
--- 71,81 ----
      G1StringDedupQueue::push(0 /* worker_id */, java_string);
    }
  }
  
  bool G1StringDedup::is_candidate_from_evacuation(bool from_young, bool to_young, oop obj) {
!   if (from_young && java_lang_String::is_instance_inlined(obj)) {
      if (to_young && obj->age() == StringDeduplicationAgeThreshold) {
        // Candidate found. String is being evacuated from young to young and just
        // reached the deduplication age threshold.
        return true;
      }