diff options
| author | 2018-03-15 01:31:37 +0000 | |
|---|---|---|
| committer | 2018-03-15 01:31:37 +0000 | |
| commit | cb007b9c47f101d2f631f7f4b52c1a57aad6f459 (patch) | |
| tree | 31378bb5772bafcffaa54e45073af675ac3e6f58 /compiler/optimizing | |
| parent | 5a56d19a3ec4f570720a395cfa7dd0d7fcca2be8 (diff) | |
| parent | e26c6ff5c28f803406a5bcbda8ac27a4e718fde6 (diff) | |
Merge cherrypicks of [3739591, 3740135] into pi-release
Change-Id: I4caa7a73294f558286fc66a86f26954f4ebcac8a
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/code_generator_arm64.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 60f8f98757..ad687f8256 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -1623,6 +1623,7 @@ void CodeGeneratorARM64::SetupBlockedRegisters() const { while (!reserved_core_registers.IsEmpty()) { blocked_core_registers_[reserved_core_registers.PopLowestIndex().GetCode()] = true; } + blocked_core_registers_[X18] = true; CPURegList reserved_fp_registers = vixl_reserved_fp_registers; while (!reserved_fp_registers.IsEmpty()) { |