src/hotspot/cpu/arm/c1_FrameMap_arm.hpp

*** 52,64 ****
    static LIR_Opr R2_metadata_opr;
    static LIR_Opr R3_metadata_opr;
    static LIR_Opr R4_metadata_opr;
    static LIR_Opr R5_metadata_opr;
  
- #ifdef AARCH64
-   static LIR_Opr ZR_opr;
- #endif // AARCH64
  
    static LIR_Opr LR_opr;
    static LIR_Opr LR_oop_opr;
    static LIR_Opr LR_ptr_opr;
  
--- 52,61 ----
*** 73,95 ****
    static LIR_Opr Double_result_opr;
  
    static LIR_Opr Exception_oop_opr;
    static LIR_Opr Exception_pc_opr;
  
- #ifdef AARCH64
-   static LIR_Opr as_long_opr(Register r) {
-     return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r));
-   }
- 
-   static LIR_Opr as_pointer_opr(Register r) {
-     return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r));
-   }
- 
-   static LIR_Opr as_double_opr(FloatRegister r) {
-     return LIR_OprFact::double_fpu(r->encoding());
-   }
- #else
    static LIR_Opr as_long_opr(Register r, Register r2) {
      return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r2));
    }
  
    static LIR_Opr as_pointer_opr(Register r) {
--- 70,79 ----
*** 97,107 ****
    }
  
    static LIR_Opr as_double_opr(FloatRegister r) {
      return LIR_OprFact::double_fpu(r->encoding(), r->successor()->encoding());
    }
- #endif
  
    static LIR_Opr as_float_opr(FloatRegister r) {
      return LIR_OprFact::single_fpu(r->encoding());
    }
  
--- 81,90 ----