src/share/vm/gc_implementation/shared/markSweep.inline.hpp

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) 2000, 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) 2000, 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.
*** 28,41 ****
--- 28,49 ----
  #include "gc_implementation/shared/markSweep.hpp"
  #include "gc_interface/collectedHeap.hpp"
  #include "utilities/stack.inline.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc_implementation/g1/g1StringDedup.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #endif // INCLUDE_ALL_GCS
  
  inline void MarkSweep::mark_object(oop obj) {
+ #if INCLUDE_ALL_GCS
+   if (G1StringDedup::is_enabled()) {
+     // We must enqueue the object before it is marked
+     // as we otherwise can't read the object's age.
+     G1StringDedup::enqueue_from_mark(obj);
+   }
+ #endif
    // some marks may contain information we need to preserve so we store them away
    // and overwrite the mark.  We'll restore it at the end of markSweep.
    markOop mark = obj->mark();
    obj->set_mark(markOopDesc::prototype()->set_marked());