src/hotspot/cpu/x86/interpreterRT_x86.hpp

*** 23,34 ****
   */
  
  #ifndef CPU_X86_VM_INTERPRETERRT_X86_HPP
  #define CPU_X86_VM_INTERPRETERRT_X86_HPP
  
- #include "memory/allocation.hpp"
- 
  // native method calls
  
  class SignatureHandlerGenerator: public NativeSignatureIterator {
   private:
    MacroAssembler* _masm;
--- 23,32 ----
*** 53,75 ****
  #endif // AMD64
    void pass_object();
  
   public:
    // Creation
!   SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
!     _masm = new MacroAssembler(buffer);
! #ifdef AMD64
! #ifdef _WIN64
!     _num_args = (method->is_static() ? 1 : 0);
!     _stack_offset = (Argument::n_int_register_parameters_c+1)* wordSize; // don't overwrite return address
! #else
!     _num_int_args = (method->is_static() ? 1 : 0);
!     _num_fp_args = 0;
!     _stack_offset = wordSize; // don't overwrite return address
! #endif // _WIN64
! #endif // AMD64
!   }
  
    // Code generation
    void generate(uint64_t fingerprint);
  
    // Code generation support
--- 51,61 ----
  #endif // AMD64
    void pass_object();
  
   public:
    // Creation
!   SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer);
  
    // Code generation
    void generate(uint64_t fingerprint);
  
    // Code generation support