src/cpu/x86/vm/assembler_x86.cpp

*** 8002,8020 ****
  // method handle's MethodType.  This macro hides the distinction.
  void MacroAssembler::load_method_handle_vmslots(Register vmslots_reg, Register mh_reg,
                                                  Register temp_reg) {
    assert_different_registers(vmslots_reg, mh_reg, temp_reg);
    // load mh.type.form.vmslots
-   if (java_lang_invoke_MethodHandle::vmslots_offset_in_bytes() != 0) {
-     // hoist vmslots into every mh to avoid dependent load chain
-     movl(vmslots_reg, Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::vmslots_offset_in_bytes, temp_reg)));
-   } else {
      Register temp2_reg = vmslots_reg;
      load_heap_oop(temp2_reg, Address(mh_reg,    delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg)));
      load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodType::form_offset_in_bytes, temp_reg)));
      movl(vmslots_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)));
-   }
  }
  
  
  // registers on entry:
  //  - rcx: method handle
--- 8002,8015 ----