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/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 273c67d..d00e3a3 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -629,7 +629,7 @@
           WellKnownClasses::StringInitToStringFactory(soa.DecodeMethod(mid)));
       return CallStaticObjectMethodV(env, WellKnownClasses::java_lang_StringFactory, sf_mid, args);
     }
-    mirror::Object* result = c->AllocObject(soa.Self());
+    ObjPtr<mirror::Object> result = c->AllocObject(soa.Self());
     if (result == nullptr) {
       return nullptr;
     }
@@ -656,7 +656,7 @@
           WellKnownClasses::StringInitToStringFactory(soa.DecodeMethod(mid)));
       return CallStaticObjectMethodA(env, WellKnownClasses::java_lang_StringFactory, sf_mid, args);
     }
-    mirror::Object* result = c->AllocObject(soa.Self());
+    ObjPtr<mirror::Object> result = c->AllocObject(soa.Self());
     if (result == nullptr) {
       return nullptr;
     }