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

rev 12506 : [mq]: 8160874-remove-typo-in-g1initalmarkclosures

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, 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) 2015, 2017, 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.
*** 57,67 ****
  
  // Closures used during initial mark.
  // The treatment of "weak" roots is selectable through the template parameter,
  // this is usually used to control unloading of classes and interned strings.
  template <G1Mark MarkWeak>
! class G1InitalMarkClosures : public G1EvacuationRootClosures {
    G1SharedClosures<G1MarkFromRoot> _strong;
    G1SharedClosures<MarkWeak>       _weak;
  
    // Filter method to help with returning the appropriate closures
    // depending on the class template parameter.
--- 57,67 ----
  
  // Closures used during initial mark.
  // The treatment of "weak" roots is selectable through the template parameter,
  // this is usually used to control unloading of classes and interned strings.
  template <G1Mark MarkWeak>
! class G1InitialMarkClosures : public G1EvacuationRootClosures {
    G1SharedClosures<G1MarkFromRoot> _strong;
    G1SharedClosures<MarkWeak>       _weak;
  
    // Filter method to help with returning the appropriate closures
    // depending on the class template parameter.
*** 72,82 ****
      }
      return t;
    }
  
  public:
!   G1InitalMarkClosures(G1CollectedHeap* g1h,
                         G1ParScanThreadState* pss) :
        _strong(g1h, pss, /* process_only_dirty_klasses */ false, /* must_claim_cld */ true),
        _weak(g1h, pss,   /* process_only_dirty_klasses */ false, /* must_claim_cld */ true) {}
  
    OopClosure* weak_oops()   { return &_weak._buffered_oops; }
--- 72,82 ----
      }
      return t;
    }
  
  public:
!   G1InitialMarkClosures(G1CollectedHeap* g1h,
                          G1ParScanThreadState* pss) :
        _strong(g1h, pss, /* process_only_dirty_klasses */ false, /* must_claim_cld */ true),
        _weak(g1h, pss,   /* process_only_dirty_klasses */ false, /* must_claim_cld */ true) {}
  
    OopClosure* weak_oops()   { return &_weak._buffered_oops; }
*** 116,128 ****
      return res;
    }
  
    if (g1h->collector_state()->during_initial_mark_pause()) {
      if (ClassUnloadingWithConcurrentMark) {
!       res = new G1InitalMarkClosures<G1MarkPromotedFromRoot>(g1h, pss);
      } else {
!       res = new G1InitalMarkClosures<G1MarkFromRoot>(g1h, pss);
      }
    } else {
      res = new G1EvacuationClosures(g1h, pss, g1h->collector_state()->gcs_are_young());
    }
    return res;
--- 116,128 ----
      return res;
    }
  
    if (g1h->collector_state()->during_initial_mark_pause()) {
      if (ClassUnloadingWithConcurrentMark) {
!       res = new G1InitialMarkClosures<G1MarkPromotedFromRoot>(g1h, pss);
      } else {
!       res = new G1InitialMarkClosures<G1MarkFromRoot>(g1h, pss);
      }
    } else {
      res = new G1EvacuationClosures(g1h, pss, g1h->collector_state()->gcs_are_young());
    }
    return res;