src/hotspot/share/gc/serial/markSweep.inline.hpp

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

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 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) 2000, 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.
*** 39,53 ****
    T heap_oop = oopDesc::load_heap_oop(p);
    if (!oopDesc::is_null(heap_oop)) {
      oop obj     = oopDesc::decode_heap_oop_not_null(heap_oop);
      assert(Universe::heap()->is_in(obj), "should be in heap");
  
!     oop new_obj = oop(obj->mark()->decode_pointer());
  
      assert(new_obj != NULL ||                         // is forwarding ptr?
!            obj->mark() == markOopDesc::prototype() || // not gc marked?
!            (UseBiasedLocking && obj->mark()->has_bias_pattern()),
             // not gc marked?
             "should be forwarded");
  
      if (new_obj != NULL) {
        assert(Universe::heap()->is_in_reserved(new_obj),
--- 39,53 ----
    T heap_oop = oopDesc::load_heap_oop(p);
    if (!oopDesc::is_null(heap_oop)) {
      oop obj     = oopDesc::decode_heap_oop_not_null(heap_oop);
      assert(Universe::heap()->is_in(obj), "should be in heap");
  
!     oop new_obj = oop(obj->mark_raw()->decode_pointer());
  
      assert(new_obj != NULL ||                         // is forwarding ptr?
!            obj->mark_raw() == markOopDesc::prototype() || // not gc marked?
!            (UseBiasedLocking && obj->mark_raw()->has_bias_pattern()),
             // not gc marked?
             "should be forwarded");
  
      if (new_obj != NULL) {
        assert(Universe::heap()->is_in_reserved(new_obj),