--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Tue Jul 30 22:15:23 2019 +0200
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Tue Jul 30 22:16:48 2019 +0200
@@ -259,29 +259,6 @@
   // generate code to handle arguments
   iterate(fingerprint);
 
-  // set the call format
-  // n.b. allow extra 1 for the JNI_Env in c_rarg0
-  unsigned int call_format = ((_num_int_args + 1) << 6) | (_num_fp_args << 2);
-
-  switch (method()->result_type()) {
-  case T_VOID:
-    call_format |= MacroAssembler::ret_type_void;
-    break;
-  case T_FLOAT:
-    call_format |= MacroAssembler::ret_type_float;
-    break;
-  case T_DOUBLE:
-    call_format |= MacroAssembler::ret_type_double;
-    break;
-  default:
-    call_format |= MacroAssembler::ret_type_integral;
-    break;
-  }
-
-  // // store the call format in the method
-  // __ movw(r0, call_format);
-  // __ str(r0, Address(rmethod, Method::call_format_offset()));
-
   // return result handler
   __ lea(r0, ExternalAddress(Interpreter::result_handler(method()->result_type())));
   __ ret(lr);
@@ -392,28 +369,6 @@
     _num_fp_args = 0;
   }
 
-  // n.b. allow extra 1 for the JNI_Env in c_rarg0
-  unsigned int get_call_format()
-  {
-    unsigned int call_format = ((_num_int_args + 1) << 6) | (_num_fp_args << 2);
-
-    switch (method()->result_type()) {
-    case T_VOID:
-      call_format |= MacroAssembler::ret_type_void;
-      break;
-    case T_FLOAT:
-      call_format |= MacroAssembler::ret_type_float;
-      break;
-    case T_DOUBLE:
-      call_format |= MacroAssembler::ret_type_double;
-      break;
-    default:
-      call_format |= MacroAssembler::ret_type_integral;
-      break;
-    }
-
-    return call_format;
-  }
 };
 
 
@@ -429,9 +384,6 @@
   SlowSignatureHandler ssh(m, (address)from, to);
   ssh.iterate(UCONST64(-1));
 
-  // // set the call format
-  // method->set_call_format(ssh.get_call_format());
-
   // return result handler
   return Interpreter::result_handler(m->result_type());
 JRT_END

--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Tue Jul 30 22:15:23 2019 +0200
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Tue Jul 30 22:16:48 2019 +0200
@@ -34,7 +34,6 @@
 class SignatureHandlerGenerator: public NativeSignatureIterator {
  private:
   MacroAssembler* _masm;
-  unsigned int _call_format;
   unsigned int _num_fp_args;
   unsigned int _num_int_args;
   int _stack_offset;

--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	Tue Jul 30 22:15:23 2019 +0200
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	Tue Jul 30 22:16:48 2019 +0200
@@ -1182,8 +1182,6 @@
   //
 
   public:
-  // enum used for aarch64--x86 linkage to define return type of x86 function
-  enum ret_type { ret_type_void, ret_type_integral, ret_type_float, ret_type_double};
 
   void ldr_constant(Register dest, const Address &const_addr) {
     if (NearCpool) {