src/hotspot/cpu/s390/sharedRuntime_s390.cpp

rev 56779 : 8233328: fix minimal VM build on Linux s390x

*** 45,54 ****
--- 45,55 ----
  #endif
  #ifdef COMPILER2
  #include "opto/ad.hpp"
  #include "opto/runtime.hpp"
  #endif
+ #include "nativeInst_s390.hpp"
  
  #ifdef PRODUCT
  #define __ masm->
  #else
  #define __ (Verbose ? (masm->block_comment(FILE_AND_LINE),masm):masm)->
*** 1519,1529 ****
                                                  int compile_id,
                                                  BasicType *in_sig_bt,
                                                  VMRegPair *in_regs,
                                                  BasicType ret_type,
                                                  address critical_entry) {
- #ifdef COMPILER2
    int total_in_args = method->size_of_parameters();
    if (method->is_method_handle_intrinsic()) {
      vmIntrinsics::ID iid = method->intrinsic_id();
      intptr_t start = (intptr_t) __ pc();
      int vep_offset = ((intptr_t) __ pc()) - start;
--- 1520,1529 ----
*** 2399,2412 ****
    if (is_critical_native) {
      nm->set_lazy_critical_native(true);
    }
  
    return nm;
- #else
-   ShouldNotReachHere();
-   return NULL;
- #endif // COMPILER2
  }
  
  static address gen_c2i_adapter(MacroAssembler  *masm,
                                 int total_args_passed,
                                 int comp_args_on_stack,
--- 2399,2408 ----
*** 2878,2888 ****
    // The return_pc has been stored in the frame of the deoptee and
    // will replace the address of the deopt_handler in the call
    // to Deoptimization::fetch_unroll_info below.
    // The (int) cast is necessary, because -((unsigned int)14)
    // is an unsigned int.
!   __ add2reg(Z_R14, -(int)HandlerImpl::size_deopt_handler());
  
    const Register   exec_mode_reg = Z_tmp_1;
  
    // stack: (deoptee, caller of deoptee, ...)
  
--- 2874,2884 ----
    // The return_pc has been stored in the frame of the deoptee and
    // will replace the address of the deopt_handler in the call
    // to Deoptimization::fetch_unroll_info below.
    // The (int) cast is necessary, because -((unsigned int)14)
    // is an unsigned int.
!   __ add2reg(Z_R14, -(int)NativeCall::max_instruction_size());
  
    const Register   exec_mode_reg = Z_tmp_1;
  
    // stack: (deoptee, caller of deoptee, ...)