src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 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) 2005, 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.
*** 669,679 ****
    }
  }
  
  LIR_Opr LIRGenerator::atomic_cmpxchg(BasicType type, LIR_Opr addr, LIRItem& cmp_value, LIRItem& new_value) {
    LIR_Opr ill = LIR_OprFact::illegalOpr;  // for convenience
!   if (type == T_OBJECT || type == T_ARRAY) {
      cmp_value.load_item_force(FrameMap::rax_oop_opr);
      new_value.load_item();
      __ cas_obj(addr->as_address_ptr()->base(), cmp_value.result(), new_value.result(), ill, ill);
    } else if (type == T_INT) {
      cmp_value.load_item_force(FrameMap::rax_opr);
--- 669,679 ----
    }
  }
  
  LIR_Opr LIRGenerator::atomic_cmpxchg(BasicType type, LIR_Opr addr, LIRItem& cmp_value, LIRItem& new_value) {
    LIR_Opr ill = LIR_OprFact::illegalOpr;  // for convenience
!   if (is_reference_type(type)) {
      cmp_value.load_item_force(FrameMap::rax_oop_opr);
      new_value.load_item();
      __ cas_obj(addr->as_address_ptr()->base(), cmp_value.result(), new_value.result(), ill, ill);
    } else if (type == T_INT) {
      cmp_value.load_item_force(FrameMap::rax_opr);
*** 691,701 ****
             result, T_INT);
    return result;
  }
  
  LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value) {
!   bool is_oop = type == T_OBJECT || type == T_ARRAY;
    LIR_Opr result = new_register(type);
    value.load_item();
    // Because we want a 2-arg form of xchg and xadd
    __ move(value.result(), result);
    assert(type == T_INT || is_oop LP64_ONLY( || type == T_LONG ), "unexpected type");
--- 691,701 ----
             result, T_INT);
    return result;
  }
  
  LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value) {
!   bool is_oop = is_reference_type(type);
    LIR_Opr result = new_register(type);
    value.load_item();
    // Because we want a 2-arg form of xchg and xadd
    __ move(value.result(), result);
    assert(type == T_INT || is_oop LP64_ONLY( || type == T_LONG ), "unexpected type");