src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2018, 2019, 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,42 ****
                                                     Register src, Register dst, Register count) {
    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
    bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
    bool obj_int = type == T_OBJECT LP64_ONLY(&& UseCompressedOops);
  
!   if (type == T_OBJECT || type == T_ARRAY) {
  #ifdef _LP64
      if (!checkcast) {
        if (!obj_int) {
          // Save count for barrier
          __ movptr(r11, count);
--- 32,42 ----
                                                     Register src, Register dst, Register count) {
    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
    bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
    bool obj_int = type == T_OBJECT LP64_ONLY(&& UseCompressedOops);
  
!   if (is_reference_type(type)) {
  #ifdef _LP64
      if (!checkcast) {
        if (!obj_int) {
          // Save count for barrier
          __ movptr(r11, count);
*** 59,69 ****
    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
    bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
    bool obj_int = type == T_OBJECT LP64_ONLY(&& UseCompressedOops);
    Register tmp = rax;
  
!   if (type == T_OBJECT || type == T_ARRAY) {
  #ifdef _LP64
      if (!checkcast) {
        if (!obj_int) {
          // Save count for barrier
          count = r11;
--- 59,69 ----
    bool checkcast = (decorators & ARRAYCOPY_CHECKCAST) != 0;
    bool disjoint = (decorators & ARRAYCOPY_DISJOINT) != 0;
    bool obj_int = type == T_OBJECT LP64_ONLY(&& UseCompressedOops);
    Register tmp = rax;
  
!   if (is_reference_type(type)) {
  #ifdef _LP64
      if (!checkcast) {
        if (!obj_int) {
          // Save count for barrier
          count = r11;
*** 83,93 ****
    }
  }
  
  void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                           Address dst, Register val, Register tmp1, Register tmp2) {
!   if (type == T_OBJECT || type == T_ARRAY) {
      oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2);
    } else {
      BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
    }
  }
--- 83,93 ----
    }
  }
  
  void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                           Address dst, Register val, Register tmp1, Register tmp2) {
!   if (is_reference_type(type)) {
      oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2);
    } else {
      BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
    }
  }