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

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

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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) 2014, 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.
*** 38,48 ****
    // set, due to (benign) races in the claim mechanism during RSet scanning more
    // than one thread might claim the same card. So the same card may be
    // processed multiple times. So redo this check.
    const InCSetState in_cset_state = _g1h->in_cset_state(obj);
    if (in_cset_state.is_in_cset()) {
!     markOop m = obj->mark();
      if (m->is_marked()) {
        obj = (oop) m->decode_pointer();
      } else {
        obj = copy_to_survivor_space(in_cset_state, obj, m);
      }
--- 38,48 ----
    // set, due to (benign) races in the claim mechanism during RSet scanning more
    // than one thread might claim the same card. So the same card may be
    // processed multiple times. So redo this check.
    const InCSetState in_cset_state = _g1h->in_cset_state(obj);
    if (in_cset_state.is_in_cset()) {
!     markOop m = obj->mark_raw();
      if (m->is_marked()) {
        obj = (oop) m->decode_pointer();
      } else {
        obj = copy_to_survivor_space(in_cset_state, obj, m);
      }