commit a7426c6a9ceeec193f6d886df7d0dcb3018f919d
author Roland Levillain <rpl@google.com> Wed Aug 03 15:02:10 2016 +0100
committer Roland Levillain <rpl@google.com> Wed Aug 03 15:05:43 2016 +0100
tree 51e3513626ec0faf4ed648032e498bbd5e9c40d9
parent d16ae7fe70d74091778e5952b7920df14866287f

Fix an assertion in the non-Baker read barrier ARM64 slow path.

Test: m ART_USE_READ_BARRIER=true ART_READ_BARRIER_TYPE=TABLELOOKUP test-art-target (ARM64).
Bug: 30563701
Change-Id: Ib7969bd78e9c14cc2be9d5527d80385486b4f409

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 115cee6..1d73734 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -751,10 +751,7 @@
                (instruction_->AsInvoke()->GetIntrinsic() == Intrinsics::kUnsafeGetObjectVolatile))
             << instruction_->AsInvoke()->GetIntrinsic();
         DCHECK_EQ(offset_, 0U);
-        DCHECK(index_.IsRegisterPair());
-        // UnsafeGet's offset location is a register pair, the low
-        // part contains the correct offset.
-        index = index_.ToLow();
+        DCHECK(index_.IsRegister());
       }
     }