src/hotspot/share/gc/g1/g1ParScanThreadState.cpp

*** 309,319 ****
        // length field of the from-space object.
        arrayOop(obj)->set_length(0);
        oop* old_p = set_partial_array_mask(old);
        do_oop_partial_array(old_p);
      } else {
!       _scanner.set_from_is_young(dest_state.is_young());
        obj->oop_iterate_backwards(&_scanner);
      }
      return obj;
    } else {
      _plab_allocator->undo_allocation(dest_state, obj_ptr, word_sz);
--- 309,319 ----
        // length field of the from-space object.
        arrayOop(obj)->set_length(0);
        oop* old_p = set_partial_array_mask(old);
        do_oop_partial_array(old_p);
      } else {
!       _scanner.set_scanning_in_young(dest_state.is_young());
        obj->oop_iterate_backwards(&_scanner);
      }
      return obj;
    } else {
      _plab_allocator->undo_allocation(dest_state, obj_ptr, word_sz);
*** 364,374 ****
       _g1h->hr_printer()->evac_failure(r);
      }
  
      _g1h->preserve_mark_during_evac_failure(_worker_id, old, m);
  
!     _scanner.set_from_is_young(r->is_young());
      old->oop_iterate_backwards(&_scanner);
  
      return old;
    } else {
      // Forward-to-self failed. Either someone else managed to allocate
--- 364,374 ----
       _g1h->hr_printer()->evac_failure(r);
      }
  
      _g1h->preserve_mark_during_evac_failure(_worker_id, old, m);
  
!     _scanner.set_scanning_in_young(r->is_young());
      old->oop_iterate_backwards(&_scanner);
  
      return old;
    } else {
      // Forward-to-self failed. Either someone else managed to allocate