diff options
| author | 2016-07-18 11:19:14 +0000 | |
|---|---|---|
| committer | 2016-07-18 11:19:14 +0000 | |
| commit | 471c2270aa8606ba62d06b0d2eef8c8fd3ec5f9f (patch) | |
| tree | 671bb60203157fdb34dd2e9cdf851cb79eb02a0e /compiler/optimizing/code_generator.cc | |
| parent | 173f435e56acfd0501fc460747572a4796dcffe0 (diff) | |
| parent | 68bd9b9b165ffca1a49b80bb437ce9f87b738264 (diff) | |
Merge "ARM64: Improve code generated to spill/restore for slow paths."
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index d40e2b9ad1..9c6dcaa7b3 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -291,7 +291,8 @@ void CodeGenerator::InitializeCodeGeneration(size_t number_of_spill_slots, DCHECK(!block_order.empty()); DCHECK(block_order[0] == GetGraph()->GetEntryBlock()); ComputeSpillMask(); - first_register_slot_in_slow_path_ = (number_of_out_slots + number_of_spill_slots) * kVRegSize; + first_register_slot_in_slow_path_ = RoundUp( + (number_of_out_slots + number_of_spill_slots) * kVRegSize, GetPreferredSlotsAlignment()); if (number_of_spill_slots == 0 && !HasAllocatedCalleeSaveRegisters() @@ -302,8 +303,7 @@ void CodeGenerator::InitializeCodeGeneration(size_t number_of_spill_slots, SetFrameSize(CallPushesPC() ? GetWordSize() : 0); } else { SetFrameSize(RoundUp( - number_of_spill_slots * kVRegSize - + number_of_out_slots * kVRegSize + first_register_slot_in_slow_path_ + maximum_number_of_live_core_registers * GetWordSize() + maximum_number_of_live_fpu_registers * GetFloatingPointSpillSlotSize() + FrameEntrySpillSize(), |