src/cpu/zero/vm/interpreterRT_zero.hpp

*** 65,75 ****
  class SignatureHandlerGeneratorBase : public NativeSignatureIterator {
   private:
    ffi_cif* _cif;
  
   protected:
!   SignatureHandlerGeneratorBase(methodHandle method, ffi_cif *cif)
      : NativeSignatureIterator(method), _cif(cif) {
      _cif->nargs = 0;
    }
  
    ffi_cif *cif() const {
--- 65,75 ----
  class SignatureHandlerGeneratorBase : public NativeSignatureIterator {
   private:
    ffi_cif* _cif;
  
   protected:
!   SignatureHandlerGeneratorBase(const methodHandle& method, ffi_cif *cif)
      : NativeSignatureIterator(method), _cif(cif) {
      _cif->nargs = 0;
    }
  
    ffi_cif *cif() const {
*** 94,104 ****
  class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
   private:
    CodeBuffer* _cb;
  
   public:
!   SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
      : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()),
        _cb(buffer) {
      _cb->set_insts_end((address) (cif() + 1));
    }
  
--- 94,104 ----
  class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
   private:
    CodeBuffer* _cb;
  
   public:
!   SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer)
      : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()),
        _cb(buffer) {
      _cb->set_insts_end((address) (cif() + 1));
    }
  
*** 113,123 ****
  class SlowSignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
   private:
    intptr_t *_dst;
  
   public:
!   SlowSignatureHandlerGenerator(methodHandle method, intptr_t* buf)
      : SignatureHandlerGeneratorBase(method, (ffi_cif *) buf) {
      _dst = (intptr_t *) (cif() + 1);
    }
  
   private:
--- 113,123 ----
  class SlowSignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
   private:
    intptr_t *_dst;
  
   public:
!   SlowSignatureHandlerGenerator(const methodHandle& method, intptr_t* buf)
      : SignatureHandlerGeneratorBase(method, (ffi_cif *) buf) {
      _dst = (intptr_t *) (cif() + 1);
    }
  
   private: