src/hotspot/share/gc/g1/g1OopClosures.inline.hpp

rev 49290 : [mq]: JDK-8199735.01.patch

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2018, 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.
*** 32,52 ****
  #include "gc/g1/g1RemSet.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "memory/iterator.inline.hpp"
  #include "oops/access.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
  template <class T>
  inline void G1ScanClosureBase::prefetch_and_push(T* p, const oop obj) {
    // We're not going to even bother checking whether the object is
    // already forwarded or not, as this usually causes an immediate
    // stall. We'll try to prefetch the object (for write, given that
    // we might need to install the forwarding reference) and we'll
    // get back to it when pop it from the queue
!   Prefetch::write(obj->mark_addr(), 0);
!   Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
  
    // slightly paranoid test; I'm trying to catch potential
    // problems before we go into push_on_queue to know where the
    // problem is coming from
    assert((obj == oopDesc::load_decode_heap_oop(p)) ||
--- 32,53 ----
  #include "gc/g1/g1RemSet.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "memory/iterator.inline.hpp"
  #include "oops/access.inline.hpp"
+ #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
  template <class T>
  inline void G1ScanClosureBase::prefetch_and_push(T* p, const oop obj) {
    // We're not going to even bother checking whether the object is
    // already forwarded or not, as this usually causes an immediate
    // stall. We'll try to prefetch the object (for write, given that
    // we might need to install the forwarding reference) and we'll
    // get back to it when pop it from the queue
!   Prefetch::write(obj->mark_addr_raw(), 0);
!   Prefetch::read(obj->mark_addr_raw(), (HeapWordSize*2));
  
    // slightly paranoid test; I'm trying to catch potential
    // problems before we go into push_on_queue to know where the
    // problem is coming from
    assert((obj == oopDesc::load_decode_heap_oop(p)) ||
*** 230,240 ****
    assert(_worker_id == _par_scan_state->worker_id(), "sanity");
  
    const InCSetState state = _g1->in_cset_state(obj);
    if (state.is_in_cset()) {
      oop forwardee;
!     markOop m = obj->mark();
      if (m->is_marked()) {
        forwardee = (oop) m->decode_pointer();
      } else {
        forwardee = _par_scan_state->copy_to_survivor_space(state, obj, m);
      }
--- 231,241 ----
    assert(_worker_id == _par_scan_state->worker_id(), "sanity");
  
    const InCSetState state = _g1->in_cset_state(obj);
    if (state.is_in_cset()) {
      oop forwardee;
!     markOop m = obj->mark_raw();
      if (m->is_marked()) {
        forwardee = (oop) m->decode_pointer();
      } else {
        forwardee = _par_scan_state->copy_to_survivor_space(state, obj, m);
      }