src/cpu/aarch64/vm/macroAssembler_aarch64.cpp

*** 896,912 ****
    assert_different_registers(recv_klass, intf_klass, method_result, scan_temp);
    assert(itable_index.is_constant() || itable_index.as_register() == method_result,
           "caller must use same register for non-constant itable index as for method");
  
    // Compute start of first itableOffsetEntry (which is at the end of the vtable)
!   int vtable_base = in_bytes(InstanceKlass::vtable_start_offset());
    int itentry_off = itableMethodEntry::method_offset_in_bytes();
    int scan_step   = itableOffsetEntry::size() * wordSize;
    int vte_size    = vtableEntry::size_in_bytes();
    assert(vte_size == wordSize, "else adjust times_vte_scale");
  
!   ldrw(scan_temp, Address(recv_klass, InstanceKlass::vtable_length_offset()));
  
    // %%% Could store the aligned, prescaled offset in the klassoop.
    // lea(scan_temp, Address(recv_klass, scan_temp, times_vte_scale, vtable_base));
    lea(scan_temp, Address(recv_klass, scan_temp, Address::lsl(3)));
    add(scan_temp, scan_temp, vtable_base);
--- 896,912 ----
    assert_different_registers(recv_klass, intf_klass, method_result, scan_temp);
    assert(itable_index.is_constant() || itable_index.as_register() == method_result,
           "caller must use same register for non-constant itable index as for method");
  
    // Compute start of first itableOffsetEntry (which is at the end of the vtable)
!   int vtable_base = in_bytes(Klass::vtable_start_offset());
    int itentry_off = itableMethodEntry::method_offset_in_bytes();
    int scan_step   = itableOffsetEntry::size() * wordSize;
    int vte_size    = vtableEntry::size_in_bytes();
    assert(vte_size == wordSize, "else adjust times_vte_scale");
  
!   ldrw(scan_temp, Address(recv_klass, Klass::vtable_length_offset()));
  
    // %%% Could store the aligned, prescaled offset in the klassoop.
    // lea(scan_temp, Address(recv_klass, scan_temp, times_vte_scale, vtable_base));
    lea(scan_temp, Address(recv_klass, scan_temp, Address::lsl(3)));
    add(scan_temp, scan_temp, vtable_base);
*** 961,971 ****
  
  // virtual method calling
  void MacroAssembler::lookup_virtual_method(Register recv_klass,
                                             RegisterOrConstant vtable_index,
                                             Register method_result) {
!   const int base = in_bytes(InstanceKlass::vtable_start_offset());
    assert(vtableEntry::size() * wordSize == 8,
           "adjust the scaling in the code below");
    int vtable_offset_in_bytes = base + vtableEntry::method_offset_in_bytes();
  
    if (vtable_index.is_register()) {
--- 961,971 ----
  
  // virtual method calling
  void MacroAssembler::lookup_virtual_method(Register recv_klass,
                                             RegisterOrConstant vtable_index,
                                             Register method_result) {
!   const int base = in_bytes(Klass::vtable_start_offset());
    assert(vtableEntry::size() * wordSize == 8,
           "adjust the scaling in the code below");
    int vtable_offset_in_bytes = base + vtableEntry::method_offset_in_bytes();
  
    if (vtable_index.is_register()) {