commit bbfd7f99888a70e912c9d01a0bd35cee7d294fdb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 27 08:08:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 27 08:08:35 2016 +0000
tree 11cd3182265c3426b00a34acc5c36961b351408f
parent 4cae498641fe3afccbafb5cbdbed9951f6949f41
parent a314773a624f9f51391be91bda3472bbdbe0050e

Merge "Add handle wrapper for interpreter iget/iput quick"

runtime/interpreter/interpreter_common.cc

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index f212cda..1ed3d55 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -163,6 +163,9 @@
                                                         field_offset.Uint32Value());
     DCHECK(f != nullptr);
     DCHECK(!f->IsStatic());
+    StackHandleScope<1> hs(Thread::Current());
+    // Save obj in case the instrumentation event has thread suspension.
+    HandleWrapperObjPtr<mirror::Object> h = hs.NewHandleWrapper(&obj);
     instrumentation->FieldReadEvent(Thread::Current(),
                                     obj.Ptr(),
                                     shadow_frame.GetMethod(),
@@ -392,6 +395,9 @@
     DCHECK(f != nullptr);
     DCHECK(!f->IsStatic());
     JValue field_value = GetFieldValue<field_type>(shadow_frame, vregA);
+    StackHandleScope<1> hs(Thread::Current());
+    // Save obj in case the instrumentation event has thread suspension.
+    HandleWrapperObjPtr<mirror::Object> h = hs.NewHandleWrapper(&obj);
     instrumentation->FieldWriteEvent(Thread::Current(),
                                      obj.Ptr(),
                                      shadow_frame.GetMethod(),