Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Mon Mar 24 09:14:14 2014 -0700
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Tue Mar 18 19:07:22 2014 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -31,6 +31,7 @@
    1.11  #include "code/icBuffer.hpp"
    1.12  #include "gc_implementation/g1/g1Log.hpp"
    1.13  #include "gc_implementation/g1/g1MarkSweep.hpp"
    1.14 +#include "gc_implementation/g1/g1StringDedup.hpp"
    1.15  #include "gc_implementation/shared/gcHeapSummary.hpp"
    1.16  #include "gc_implementation/shared/gcTimer.hpp"
    1.17  #include "gc_implementation/shared/gcTrace.hpp"
    1.18 @@ -320,6 +321,10 @@
    1.19    // have been cleared if they pointed to non-surviving objects.)
    1.20    g1h->g1_process_weak_roots(&GenMarkSweep::adjust_pointer_closure);
    1.21  
    1.22 +  if (G1StringDedup::is_enabled()) {
    1.23 +    G1StringDedup::oops_do(&GenMarkSweep::adjust_pointer_closure);
    1.24 +  }
    1.25 +
    1.26    GenMarkSweep::adjust_marks();
    1.27  
    1.28    G1AdjustPointersClosure blk;