From 09687447764a4d5d810df3d02532e4b141e7f2cd Mon Sep 17 00:00:00 2001
From: Sebastien Hertz <shertz@google.com>
Date: Tue, 17 Nov 2015 10:35:39 +0100
Subject: [PATCH] Fix StackVisitor::GetVReg for reference in shadow frame

Also fixes 457-regs run-test that used to pass an incorrect
vreg kind.

Bug: 25428216
Change-Id: Ic31b51ca0f72350db6325f23087b06e93055d750
---
 runtime/stack.cc          | 7 ++++++-
 test/457-regs/regs_jni.cc | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/runtime/stack.cc b/runtime/stack.cc
index d7edfade1..0751f64b0 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -265,7 +265,12 @@ bool StackVisitor::GetVReg(ArtMethod* m, uint16_t vreg, VRegKind kind, uint32_t*
     }
   } else {
     DCHECK(cur_shadow_frame_ != nullptr);
-    *val = cur_shadow_frame_->GetVReg(vreg);
+    if (kind == kReferenceVReg) {
+      *val = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(
+          cur_shadow_frame_->GetVRegReference(vreg)));
+    } else {
+      *val = cur_shadow_frame_->GetVReg(vreg);
+    }
     return true;
   }
 }
diff --git a/test/457-regs/regs_jni.cc b/test/457-regs/regs_jni.cc
index 64b2336be..79fa8b031 100644
--- a/test/457-regs/regs_jni.cc
+++ b/test/457-regs/regs_jni.cc
@@ -68,7 +68,7 @@ class TestVisitor : public StackVisitor {
         CHECK(!success);
       }
 
-      CHECK(GetVReg(m, 3, kReferenceVReg, &value));
+      CHECK(GetVReg(m, 3, kIntVReg, &value));
       CHECK_EQ(value, 1u);
 
       CHECK(GetVReg(m, 4, kFloatVReg, &value));
-- 
2.11.0