diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/openjdkjvmti/transform.cc | |
| 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/openjdkjvmti/transform.cc')
| -rw-r--r-- | runtime/openjdkjvmti/transform.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/openjdkjvmti/transform.cc b/runtime/openjdkjvmti/transform.cc index b5622b5cad..ac348e7246 100644 --- a/runtime/openjdkjvmti/transform.cc +++ b/runtime/openjdkjvmti/transform.cc @@ -43,7 +43,7 @@ #include "mirror/class-inl.h" #include "mirror/class_loader-inl.h" #include "mirror/string-inl.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" #include "thread_list.h" #include "transform.h" #include "utf.h" @@ -259,7 +259,7 @@ jvmtiError GetTransformationData(ArtJvmTiEnv* env, JNIEnv* jni_env = *jni_env_ptr; art::ScopedObjectAccess soa(jni_env); art::StackHandleScope<3> hs(art::Thread::Current()); - art::Handle<art::mirror::Class> hs_klass(hs.NewHandle(soa.Decode<art::mirror::Class*>(klass))); + art::Handle<art::mirror::Class> hs_klass(hs.NewHandle(soa.Decode<art::mirror::Class>(klass))); *loader = soa.AddLocalReference<jobject>(hs_klass->GetClassLoader()); *name = art::mirror::Class::ComputeName(hs_klass)->ToModifiedUtf8(); // TODO is this always null? |