commit caafd621eb33863630380818db918a2c93c9054e
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 27 13:08:45 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jan 28 14:47:02 2020 +0000
tree 4bb0ac5b32984509242944f692e79b2f616d083d
parent 6d41e574616bd84a355c55dc25485ecd7f7b3eeb

Implement GetVRegLong for nterp.

Test: 543-env-long-ref
Bug: 112676029
Change-Id: I17c1573fbe892b5aa219d804f11b69961bc150d5

runtime/stack.cc

diff --git a/runtime/stack.cc b/runtime/stack.cc
index 20e97dc..2c76db5 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -415,16 +415,22 @@
   if (GetVRegPairFromDebuggerShadowFrame(vreg, kind_lo, kind_hi, val)) {
     return true;
   }
-  if (cur_quick_frame_ != nullptr) {
-    DCHECK(context_ != nullptr);  // You can't reliably read registers without a context.
-    DCHECK(m == GetMethod());
-    DCHECK(cur_oat_quick_method_header_->IsOptimized());
-    return GetVRegPairFromOptimizedCode(m, vreg, kind_lo, kind_hi, val);
-  } else {
+  if (cur_quick_frame_ == nullptr) {
     DCHECK(cur_shadow_frame_ != nullptr);
     *val = cur_shadow_frame_->GetVRegLong(vreg);
     return true;
   }
+  if (cur_oat_quick_method_header_->IsNterpMethodHeader()) {
+    uint64_t val_lo = NterpGetVReg(cur_quick_frame_, vreg);
+    uint64_t val_hi = NterpGetVReg(cur_quick_frame_, vreg + 1);
+    *val = (val_hi << 32) + val_lo;
+    return true;
+  }
+
+  DCHECK(context_ != nullptr);  // You can't reliably read registers without a context.
+  DCHECK(m == GetMethod());
+  DCHECK(cur_oat_quick_method_header_->IsOptimized());
+  return GetVRegPairFromOptimizedCode(m, vreg, kind_lo, kind_hi, val);
 }
 
 bool StackVisitor::GetVRegPairFromOptimizedCode(ArtMethod* m, uint16_t vreg,