diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/native/dalvik_system_DexFile.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/native/dalvik_system_DexFile.cc')
| -rw-r--r-- | runtime/native/dalvik_system_DexFile.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 384de34909..0677d5bf04 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -34,7 +34,7 @@ #include "oat_file_manager.h" #include "os.h" #include "runtime.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" #include "ScopedLocalRef.h" #include "ScopedUtfChars.h" #include "utils.h" @@ -217,7 +217,7 @@ static jboolean DexFile_closeDexFile(JNIEnv* env, jclass, jobject cookie) { bool all_deleted = true; { ScopedObjectAccess soa(env); - mirror::Object* dex_files_object = soa.Decode<mirror::Object*>(cookie); + ObjPtr<mirror::Object> dex_files_object = soa.Decode<mirror::Object>(cookie); mirror::LongArray* long_dex_files = dex_files_object->AsLongArray(); // Delete dex files associated with this dalvik.system.DexFile since there should not be running // code using it. dex_files is a vector due to multidex. @@ -277,7 +277,7 @@ static jclass DexFile_defineClassNative(JNIEnv* env, ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); StackHandleScope<1> hs(soa.Self()); Handle<mirror::ClassLoader> class_loader( - hs.NewHandle(soa.Decode<mirror::ClassLoader*>(javaLoader))); + hs.NewHandle(soa.Decode<mirror::ClassLoader>(javaLoader))); class_linker->RegisterDexFile(*dex_file, class_loader.Get()); mirror::Class* result = class_linker->DefineClass(soa.Self(), descriptor.c_str(), @@ -287,7 +287,7 @@ static jclass DexFile_defineClassNative(JNIEnv* env, *dex_class_def); // Add the used dex file. This only required for the DexFile.loadClass API since normal // class loaders already keep their dex files live. - class_linker->InsertDexFileInToClassLoader(soa.Decode<mirror::Object*>(dexFile), + class_linker->InsertDexFileInToClassLoader(soa.Decode<mirror::Object>(dexFile).Decode(), class_loader.Get()); if (result != nullptr) { VLOG(class_linker) << "DexFile_defineClassNative returning " << result |