commit fea963e4bad207531db637a77ea54e828b134861
author Narayan Kamath <narayan@google.com> Mon Oct 31 11:53:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 31 11:53:08 2016 +0000
tree 57be97c726d69537350536413e4154733ed8aafa
parent bb04c9b9baa620d2664851f58f693e8aec0c0bc0
parent 6fcc5e8e0fb4298c83286ae5a5bcd0d06180f356

Merge "Interpreter: fix build."

runtime/interpreter/interpreter_common.cc

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 41673f4..179e48b 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -936,12 +936,12 @@
 
     switch (handle_kind) {
       case kInstanceGet: {
-        ObjPtr<mirror::Object> obj = shadow_frame.GetVRegReference(receiver_vregC);
+        ObjPtr<mirror::Object> obj = shadow_frame.GetVRegReference(first_src_reg);
         DoFieldGetForInvokePolymorphic(self, shadow_frame, obj, field, field_type, result);
         return true;
       }
       case kInstancePut: {
-        ObjPtr<mirror::Object> obj = shadow_frame.GetVRegReference(receiver_vregC);
+        ObjPtr<mirror::Object> obj = shadow_frame.GetVRegReference(first_src_reg);
         return DoFieldPutForInvokePolymorphic(self, shadow_frame, obj, field, field_type, arg[1]);
       }
       case kStaticGet: {