summaryrefslogtreecommitdiff
path: root/compiler/utils/mips/assembler_mips.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2017-10-09 12:58:04 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-10-09 12:58:04 +0000
commit0967cd94860178a5809a9678d005b18c20c24707 (patch)
treef9e0c97fc7efbdbd8236b1f280227f1c9457d089 /compiler/utils/mips/assembler_mips.h
parent464f8cd7385a9958c3171e2feaa93c726043bbf8 (diff)
parente764d2e50c544c2cb98ee61a15d613161ac6bd17 (diff)
Merge "Use ScopedArenaAllocator for register allocation."
Diffstat (limited to 'compiler/utils/mips/assembler_mips.h')
-rw-r--r--compiler/utils/mips/assembler_mips.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h
index e82693a82d..57b3edd03a 100644
--- a/compiler/utils/mips/assembler_mips.h
+++ b/compiler/utils/mips/assembler_mips.h
@@ -192,16 +192,16 @@ class MipsAssembler FINAL : public Assembler, public JNIMacroAssembler<PointerSi
public:
using JNIBase = JNIMacroAssembler<PointerSize::k32>;
- explicit MipsAssembler(ArenaAllocator* arena,
+ explicit MipsAssembler(ArenaAllocator* allocator,
const MipsInstructionSetFeatures* instruction_set_features = nullptr)
- : Assembler(arena),
+ : Assembler(allocator),
overwriting_(false),
overwrite_location_(0),
reordering_(true),
ds_fsm_state_(kExpectingLabel),
ds_fsm_target_pc_(0),
- literals_(arena->Adapter(kArenaAllocAssembler)),
- jump_tables_(arena->Adapter(kArenaAllocAssembler)),
+ literals_(allocator->Adapter(kArenaAllocAssembler)),
+ jump_tables_(allocator->Adapter(kArenaAllocAssembler)),
last_position_adjustment_(0),
last_old_position_(0),
last_branch_id_(0),