commit 19711d479cd4bc4c2d02edf37526cd4e2a6235f7
author Vladimir Marko <vmarko@google.com> Fri Apr 12 14:05:34 2019 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Wed May 08 10:18:50 2019 +0000
tree 53851b37097ffe2b11e42fd271eb27869956f2c0
parent 8311489bcaa94a4527d8e010df6a78d457273b53

ObjPtr<>-ify instrumentation.

Test: m test-art-host-gtest
Test: testrunner.py --host --interpreter
Bug: 31113334
Change-Id: I95d9e1c9c9a0c9e460048c686c229618126b66d5

runtime/entrypoints/quick/quick_trampoline_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index a2420af..f3e5ee4 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -941,12 +941,12 @@
   instrumentation::Instrumentation* instr = Runtime::Current()->GetInstrumentation();
   if (instr->HasMethodEntryListeners()) {
     instr->MethodEnterEvent(soa.Self(),
-                            soa.Decode<mirror::Object>(rcvr_jobj).Ptr(),
+                            soa.Decode<mirror::Object>(rcvr_jobj),
                             proxy_method,
                             0);
     if (soa.Self()->IsExceptionPending()) {
       instr->MethodUnwindEvent(self,
-                               soa.Decode<mirror::Object>(rcvr_jobj).Ptr(),
+                               soa.Decode<mirror::Object>(rcvr_jobj),
                                proxy_method,
                                0);
       return 0;
@@ -956,13 +956,13 @@
   if (soa.Self()->IsExceptionPending()) {
     if (instr->HasMethodUnwindListeners()) {
       instr->MethodUnwindEvent(self,
-                               soa.Decode<mirror::Object>(rcvr_jobj).Ptr(),
+                               soa.Decode<mirror::Object>(rcvr_jobj),
                                proxy_method,
                                0);
     }
   } else if (instr->HasMethodExitListeners()) {
     instr->MethodExitEvent(self,
-                           soa.Decode<mirror::Object>(rcvr_jobj).Ptr(),
+                           soa.Decode<mirror::Object>(rcvr_jobj),
                            proxy_method,
                            0,
                            result);