commit e63a745f26fec5a5b4162fc83f6e88a1f696c30c
author Hiroshi Yamauchi <yamauchi@google.com> Thu Feb 27 14:44:36 2014 -0800
committer Hiroshi Yamauchi <yamauchi@google.com> Wed Mar 05 19:20:14 2014 -0800
tree f26e1429c8226c5dde5ee4c361a57754ff46298c
parent e26baffe7f9e2a54f276f5c65e48454e413683ba

Make heap reference poisoning work with the interpreter.

It is disabled by default.

Bug: 12687968
Change-Id: Iee0cad647f341a7b566f4cf74c2770d1c19312c9

compiler/utils/arm/assembler_arm.cc

diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc
index 828dffa..dbd078a 100644
--- a/compiler/utils/arm/assembler_arm.cc
+++ b/compiler/utils/arm/assembler_arm.cc
@@ -1550,6 +1550,9 @@
   CHECK(dst.IsCoreRegister() && dst.IsCoreRegister()) << dst;
   LoadFromOffset(kLoadWord, dst.AsCoreRegister(),
                  base.AsArm().AsCoreRegister(), offs.Int32Value());
+  if (kPoisonHeapReferences) {
+    rsb(dst.AsCoreRegister(), dst.AsCoreRegister(), ShifterOperand(0));
+  }
 }
 
 void ArmAssembler::LoadRef(ManagedRegister mdest, FrameOffset  src) {