src/cpu/x86/vm/c1_LIRAssembler_x86.cpp

*** 1556,1566 ****
  }
  
  void LIR_Assembler::emit_alloc_obj(LIR_OpAllocObj* op) {
    if (op->init_check()) {
      __ cmpl(Address(op->klass()->as_register(),
!                     instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc)),
              instanceKlass::fully_initialized);
      add_debug_info_for_null_check_here(op->stub()->info());
      __ jcc(Assembler::notEqual, *op->stub()->entry());
    }
    __ allocate_object(op->obj()->as_register(),
--- 1556,1566 ----
  }
  
  void LIR_Assembler::emit_alloc_obj(LIR_OpAllocObj* op) {
    if (op->init_check()) {
      __ cmpl(Address(op->klass()->as_register(),
!                     instanceKlass::init_state_offset()),
              instanceKlass::fully_initialized);
      add_debug_info_for_null_check_here(op->stub()->info());
      __ jcc(Assembler::notEqual, *op->stub()->entry());
    }
    __ allocate_object(op->obj()->as_register(),
*** 1728,1738 ****
  #ifdef _LP64
        __ cmpptr(k_RInfo, Address(klass_RInfo, k->super_check_offset()));
  #else
        __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->constant_encoding());
  #endif // _LP64
!       if (sizeof(oopDesc) + Klass::secondary_super_cache_offset_in_bytes() != k->super_check_offset()) {
          __ jcc(Assembler::notEqual, *failure_target);
          // successful cast, fall through to profile or jump
        } else {
          // See if we get an immediate positive hit
          __ jcc(Assembler::equal, *success_target);
--- 1728,1738 ----
  #ifdef _LP64
        __ cmpptr(k_RInfo, Address(klass_RInfo, k->super_check_offset()));
  #else
        __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->constant_encoding());
  #endif // _LP64
!       if ((juint)in_bytes(Klass::secondary_super_cache_offset()) != k->super_check_offset()) {
          __ jcc(Assembler::notEqual, *failure_target);
          // successful cast, fall through to profile or jump
        } else {
          // See if we get an immediate positive hit
          __ jcc(Assembler::equal, *success_target);
*** 1840,1850 ****
      add_debug_info_for_null_check_here(op->info_for_exception());
      __ load_klass(k_RInfo, array);
      __ load_klass(klass_RInfo, value);
  
      // get instance klass (it's already uncompressed)
!     __ movptr(k_RInfo, Address(k_RInfo, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
      // perform the fast part of the checking logic
      __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL);
      // call out-of-line instance of __ check_klass_subtype_slow_path(...):
      __ push(klass_RInfo);
      __ push(k_RInfo);
--- 1840,1850 ----
      add_debug_info_for_null_check_here(op->info_for_exception());
      __ load_klass(k_RInfo, array);
      __ load_klass(klass_RInfo, value);
  
      // get instance klass (it's already uncompressed)
!     __ movptr(k_RInfo, Address(k_RInfo, objArrayKlass::element_klass_offset()));
      // perform the fast part of the checking logic
      __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL);
      // call out-of-line instance of __ check_klass_subtype_slow_path(...):
      __ push(klass_RInfo);
      __ push(k_RInfo);
*** 3287,3298 ****
            if (!(flags & LIR_OpArrayCopy::src_objarray)) {
              __ load_klass(tmp, src);
            } else if (!(flags & LIR_OpArrayCopy::dst_objarray)) {
              __ load_klass(tmp, dst);
            }
!           int lh_offset = klassOopDesc::header_size() * HeapWordSize +
!             Klass::layout_helper_offset_in_bytes();
            Address klass_lh_addr(tmp, lh_offset);
            jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
            __ cmpl(klass_lh_addr, objArray_lh);
            __ jcc(Assembler::notEqual, *stub->entry());
          }
--- 3287,3297 ----
            if (!(flags & LIR_OpArrayCopy::src_objarray)) {
              __ load_klass(tmp, src);
            } else if (!(flags & LIR_OpArrayCopy::dst_objarray)) {
              __ load_klass(tmp, dst);
            }
!           int lh_offset = in_bytes(Klass::layout_helper_offset());
            Address klass_lh_addr(tmp, lh_offset);
            jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
            __ cmpl(klass_lh_addr, objArray_lh);
            __ jcc(Assembler::notEqual, *stub->entry());
          }
*** 3305,3317 ****
         store_parameter(src_pos, 3);
         store_parameter(src, 4);
  
  #ifndef _LP64
          __ movptr(tmp, dst_klass_addr);
!         __ movptr(tmp, Address(tmp, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
          __ push(tmp);
!         __ movl(tmp, Address(tmp, Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc)));
          __ push(tmp);
          __ push(length);
          __ lea(tmp, Address(dst, dst_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
          __ push(tmp);
          __ lea(tmp, Address(src, src_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
--- 3304,3316 ----
         store_parameter(src_pos, 3);
         store_parameter(src, 4);
  
  #ifndef _LP64
          __ movptr(tmp, dst_klass_addr);
!         __ movptr(tmp, Address(tmp, objArrayKlass::element_klass_offset()));
          __ push(tmp);
!         __ movl(tmp, Address(tmp, Klass::super_check_offset_offset()));
          __ push(tmp);
          __ push(length);
          __ lea(tmp, Address(dst, dst_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
          __ push(tmp);
          __ lea(tmp, Address(src, src_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
*** 3331,3349 ****
  
  #ifdef _WIN64
          // Allocate abi space for args but be sure to keep stack aligned
          __ subptr(rsp, 6*wordSize);
          __ load_klass(c_rarg3, dst);
!         __ movptr(c_rarg3, Address(c_rarg3, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
          store_parameter(c_rarg3, 4);
!         __ movl(c_rarg3, Address(c_rarg3, Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc)));
          __ call(RuntimeAddress(copyfunc_addr));
          __ addptr(rsp, 6*wordSize);
  #else
          __ load_klass(c_rarg4, dst);
!         __ movptr(c_rarg4, Address(c_rarg4, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
!         __ movl(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc)));
          __ call(RuntimeAddress(copyfunc_addr));
  #endif
  
  #endif
  
--- 3330,3348 ----
  
  #ifdef _WIN64
          // Allocate abi space for args but be sure to keep stack aligned
          __ subptr(rsp, 6*wordSize);
          __ load_klass(c_rarg3, dst);
!         __ movptr(c_rarg3, Address(c_rarg3, objArrayKlass::element_klass_offset()));
          store_parameter(c_rarg3, 4);
!         __ movl(c_rarg3, Address(c_rarg3, Klass::super_check_offset_offset()));
          __ call(RuntimeAddress(copyfunc_addr));
          __ addptr(rsp, 6*wordSize);
  #else
          __ load_klass(c_rarg4, dst);
!         __ movptr(c_rarg4, Address(c_rarg4, objArrayKlass::element_klass_offset()));
!         __ movl(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset()));
          __ call(RuntimeAddress(copyfunc_addr));
  #endif
  
  #endif