src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp

*** 51,11 ***
    jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type);
    align(CodeEntryAlignment);
    bind(verified);
  }
  
! void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_bytes) {
    assert(bang_size_in_bytes >= frame_size_in_bytes, "stack bang size incorrect");
    assert((frame_size_in_bytes % StackAlignmentInBytes) == 0, "frame size should be aligned");
  
  
    arm_stack_overflow_check(bang_size_in_bytes, Rtemp);
--- 51,11 ---
    jump(SharedRuntime::get_ic_miss_stub(), relocInfo::runtime_call_type);
    align(CodeEntryAlignment);
    bind(verified);
  }
  
! void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_bytes, int max_monitors) {
    assert(bang_size_in_bytes >= frame_size_in_bytes, "stack bang size incorrect");
    assert((frame_size_in_bytes % StackAlignmentInBytes) == 0, "frame size should be aligned");
  
  
    arm_stack_overflow_check(bang_size_in_bytes, Rtemp);

*** 161,14 ***
    initialize_object(obj, obj_end, klass, len, tmp2, tmp3, instanceOopDesc::header_size() * HeapWordSize, object_size_in_bytes, /* is_tlab_allocated */ UseTLAB);
  }
  
  void C1_MacroAssembler::allocate_array(Register obj, Register len,
                                         Register tmp1, Register tmp2, Register tmp3,
!                                        int header_size, int element_size,
                                         Register klass, Label& slow_case) {
    assert_different_registers(obj, len, tmp1, tmp2, tmp3, klass, Rtemp);
-   const int header_size_in_bytes = header_size * BytesPerWord;
    const int scale_shift = exact_log2(element_size);
    const Register obj_size = Rtemp; // Rtemp should be free at c1 LIR level
  
    cmp_32(len, max_array_allocation_length);
    b(slow_case, hs);
--- 161,13 ---
    initialize_object(obj, obj_end, klass, len, tmp2, tmp3, instanceOopDesc::header_size() * HeapWordSize, object_size_in_bytes, /* is_tlab_allocated */ UseTLAB);
  }
  
  void C1_MacroAssembler::allocate_array(Register obj, Register len,
                                         Register tmp1, Register tmp2, Register tmp3,
!                                        int header_size_in_bytes, int element_size,
                                         Register klass, Label& slow_case) {
    assert_different_registers(obj, len, tmp1, tmp2, tmp3, klass, Rtemp);
    const int scale_shift = exact_log2(element_size);
    const Register obj_size = Rtemp; // Rtemp should be free at c1 LIR level
  
    cmp_32(len, max_array_allocation_length);
    b(slow_case, hs);