commit 8778c521de4f686118549ef7b20ae497e53b9e93
author Mathieu Chartier <mathieuc@google.com> Tue Oct 04 19:06:30 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Oct 05 13:02:53 2016 -0700
tree 18e82a5860cf7c7d388f314615ba66e9a3ac4521
parent 2f61867045ffbd0c38a4ecec5f59632004f7efff

Change indirect reference table to use ObjPtr

Bug: 31113334

Test: test-art-host

Change-Id: I340fdf430897ebd790ea4e35f94bcee776e98445

runtime/jni_env_ext-inl.h

diff --git a/runtime/jni_env_ext-inl.h b/runtime/jni_env_ext-inl.h
index 685b056..2cc7342 100644
--- a/runtime/jni_env_ext-inl.h
+++ b/runtime/jni_env_ext-inl.h
@@ -19,12 +19,14 @@
 
 #include "jni_env_ext.h"
 
+#include "indirect_reference_table-inl.h"
+#include "obj_ptr-inl.h"
 #include "utils.h"
 
 namespace art {
 
 template<typename T>
-inline T JNIEnvExt::AddLocalReference(mirror::Object* obj) {
+inline T JNIEnvExt::AddLocalReference(ObjPtr<mirror::Object> obj) {
   IndirectRef ref = locals.Add(local_ref_cookie, obj);
 
   // TODO: fix this to understand PushLocalFrame, so we can turn it on.