diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2016-09-27 18:43:30 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2016-09-29 17:31:09 -0700 |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/java_vm_ext.h | |
| parent | d1224dce59eb0019507e41da5e10f12dda66bee4 (diff) | |
Clean up ScopedThreadStateChange to use ObjPtr
Also fixed inclusion of -inl.h files in .h files by adding
scoped_object_access-inl.h and scoped_fast_natvie_object_access-inl.h
Changed AddLocalReference / Decode to use ObjPtr.
Changed libartbenchmark to be debug to avoid linkage errors.
Bug: 31113334
Test: test-art-host
Change-Id: I4d2e160483a29d21e1e0e440585ed328b9811483
Diffstat (limited to 'runtime/java_vm_ext.h')
| -rw-r--r-- | runtime/java_vm_ext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/java_vm_ext.h b/runtime/java_vm_ext.h index a10a72fa94..558ffffe5a 100644 --- a/runtime/java_vm_ext.h +++ b/runtime/java_vm_ext.h @@ -22,6 +22,7 @@ #include "base/macros.h" #include "base/mutex.h" #include "indirect_reference_table.h" +#include "obj_ptr.h" #include "reference_table.h" namespace art { @@ -123,10 +124,10 @@ class JavaVMExt : public JavaVM { void BroadcastForNewWeakGlobals() REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!weak_globals_lock_); - jobject AddGlobalRef(Thread* self, mirror::Object* obj) + jobject AddGlobalRef(Thread* self, ObjPtr<mirror::Object> obj) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!globals_lock_); - jweak AddWeakGlobalRef(Thread* self, mirror::Object* obj) + jweak AddWeakGlobalRef(Thread* self, ObjPtr<mirror::Object> obj) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!weak_globals_lock_); void DeleteGlobalRef(Thread* self, jobject obj) REQUIRES(!globals_lock_); |