diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /test/common/stack_inspect.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 'test/common/stack_inspect.cc')
| -rw-r--r-- | test/common/stack_inspect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/common/stack_inspect.cc b/test/common/stack_inspect.cc index 85ea1c8dd1..d2aacf0562 100644 --- a/test/common/stack_inspect.cc +++ b/test/common/stack_inspect.cc @@ -21,7 +21,7 @@ #include "mirror/class-inl.h" #include "nth_caller_visitor.h" #include "runtime.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread-inl.h" @@ -62,7 +62,7 @@ extern "C" JNIEXPORT void JNICALL Java_Main_assertIsInterpreted(JNIEnv* env, jcl static jboolean IsManaged(JNIEnv* env, jclass cls, size_t level) { ScopedObjectAccess soa(env); - mirror::Class* klass = soa.Decode<mirror::Class*>(cls); + ObjPtr<mirror::Class> klass = soa.Decode<mirror::Class>(cls); const DexFile& dex_file = klass->GetDexFile(); const OatFile::OatDexFile* oat_dex_file = dex_file.GetOatDexFile(); if (oat_dex_file == nullptr) { |