diff options
| author | 2017-10-06 09:38:00 +0000 | |
|---|---|---|
| committer | 2017-10-06 09:38:00 +0000 | |
| commit | aa7273e56fbafc2692c8d20a31b50d2f4bdd2aa1 (patch) | |
| tree | 31af8697c08958ad9cde4cf4619f075e9d593a45 /compiler/utils/mips/assembler_mips.cc | |
| parent | 8c5e25b1a00a3b286bc00a9a7da10bb58c7bfe09 (diff) | |
| parent | 0d127e10de0b06ec22d8e855d1d62773c4ede101 (diff) | |
Merge "Do not refresh the Marking Register in CriticalNative methods."
Diffstat (limited to 'compiler/utils/mips/assembler_mips.cc')
| -rw-r--r-- | compiler/utils/mips/assembler_mips.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/utils/mips/assembler_mips.cc b/compiler/utils/mips/assembler_mips.cc index b300cc597f..b83e3f5471 100644 --- a/compiler/utils/mips/assembler_mips.cc +++ b/compiler/utils/mips/assembler_mips.cc @@ -5016,7 +5016,8 @@ void MipsAssembler::BuildFrame(size_t frame_size, } void MipsAssembler::RemoveFrame(size_t frame_size, - ArrayRef<const ManagedRegister> callee_save_regs) { + ArrayRef<const ManagedRegister> callee_save_regs, + bool may_suspend ATTRIBUTE_UNUSED) { CHECK_ALIGNED(frame_size, kStackAlignment); DCHECK(!overwriting_); cfi_.RememberState(); |