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.h | |
parent | 8c5e25b1a00a3b286bc00a9a7da10bb58c7bfe09 (diff) | |
parent | 0d127e10de0b06ec22d8e855d1d62773c4ede101 (diff) |
Merge "Do not refresh the Marking Register in CriticalNative methods."
Diffstat (limited to 'compiler/utils/mips/assembler_mips.h')
-rw-r--r-- | compiler/utils/mips/assembler_mips.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h index 0b4eb9ca55..e82693a82d 100644 --- a/compiler/utils/mips/assembler_mips.h +++ b/compiler/utils/mips/assembler_mips.h @@ -1090,8 +1090,9 @@ class MipsAssembler FINAL : public Assembler, public JNIMacroAssembler<PointerSi const ManagedRegisterEntrySpills& entry_spills) OVERRIDE; // Emit code that will remove an activation from the stack. - void RemoveFrame(size_t frame_size, ArrayRef<const ManagedRegister> callee_save_regs) - OVERRIDE; + void RemoveFrame(size_t frame_size, + ArrayRef<const ManagedRegister> callee_save_regs, + bool may_suspend) OVERRIDE; void IncreaseFrameSize(size_t adjust) OVERRIDE; void DecreaseFrameSize(size_t adjust) OVERRIDE; |