From 5743386b4d161f3884275c66b0783bd3cc3a8050 Mon Sep 17 00:00:00 2001
From: Tijana Jakovljevic <tijana.jakovljevic@imgtec.com>
Date: Tue, 17 Jan 2017 16:59:03 +0100
Subject: MIPS64: Refactor implicit null checks in array/field get/set

Rationale: on MIPS64 64-bit loads and stores may be performed
as pairs of 32-bit loads/stores. Implicit null checks must be
associated with the first 32-bit load/store in a pair and not
the last. This change ensures proper association of said checks
(a few were done after the last 32-bit load/store in a pair)
and lays ground for further improvements in array/field get/set.

Additionally ported to MIPS32.

Test: mma test-art-target-run-test in QEMU
Test: mma test-art-host-gtest

Change-Id: If2612df62c21522959e69c637a36cc4ea962a32e
---
 compiler/utils/mips/assembler_mips.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'compiler/utils/mips/assembler_mips.h')

diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h
index 47ddf2547a..1a5a23d10b 100644
--- a/compiler/utils/mips/assembler_mips.h
+++ b/compiler/utils/mips/assembler_mips.h
@@ -501,8 +501,10 @@ class MipsAssembler FINAL : public Assembler, public JNIMacroAssembler<PointerSi
                            bool is_float = false);
 
  private:
+  // This will be used as an argument for loads/stores
+  // when there is no need for implicit null checks.
   struct NoImplicitNullChecker {
-    void operator()() {}
+    void operator()() const {}
   };
 
  public:
-- 
cgit v1.2.3-59-g8ed1b