commit 28bd2e4f151267b34b8e1eb19c489d8d547bbf5c
author Mathieu Chartier <mathieuc@google.com> Tue Oct 04 13:54:57 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Oct 13 10:59:28 2016 -0700
tree d99ae3fe74ea63b83091898d830d3efe68cd479d
parent 6e5fa09510c7280168e040382d27dd8b55760d9a

Move mirror::Class to use ObjPtr

Leave the return types as non ObjPtr for now. Fixed moving GC bugs
in tests.

Test: test-art-host

Bug: 31113334

Change-Id: I5da1b5ac55dfbc5cc97a64be2c870ba9f512d9b0

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index db90a2a..bf5af8e 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -3702,7 +3702,7 @@
   args[0].l = arg.get();
   InvokeWithJValues(soa, nullptr, WellKnownClasses::java_lang_ref_FinalizerReference_add, args);
   // Restore object in case it gets moved.
-  *object = soa.Decode<mirror::Object>(arg.get()).Ptr();
+  *object = soa.Decode<mirror::Object>(arg.get());
 }
 
 void Heap::RequestConcurrentGCAndSaveObject(Thread* self,