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

rev 5952 : 8029075: String deduplication in G1
Summary: Implementation of JEP 192, http://openjdk.java.net/jeps/192
Reviewed-by: brutisso, tschatzl, coleenp

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 29,38 ****
--- 29,39 ----
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/icBuffer.hpp"
  #include "gc_implementation/g1/g1Log.hpp"
  #include "gc_implementation/g1/g1MarkSweep.hpp"
+ #include "gc_implementation/g1/g1StringDedup.hpp"
  #include "gc_implementation/shared/gcHeapSummary.hpp"
  #include "gc_implementation/shared/gcTimer.hpp"
  #include "gc_implementation/shared/gcTrace.hpp"
  #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "memory/gcLocker.hpp"
*** 318,327 ****
--- 319,332 ----
  
    // Now adjust pointers in remaining weak roots.  (All of which should
    // have been cleared if they pointed to non-surviving objects.)
    g1h->g1_process_weak_roots(&GenMarkSweep::adjust_pointer_closure);
  
+   if (G1StringDedup::is_enabled()) {
+     G1StringDedup::oops_do(&GenMarkSweep::adjust_pointer_closure);
+   }
+ 
    GenMarkSweep::adjust_marks();
  
    G1AdjustPointersClosure blk;
    g1h->heap_region_iterate(&blk);
  }