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 /compiler/exception_test.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 'compiler/exception_test.cc')
| -rw-r--r-- | compiler/exception_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index 86f91c5ac4..f9e5cb9cb7 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -31,7 +31,7 @@ #include "oat_quick_method_header.h" #include "optimizing/stack_map_stream.h" #include "runtime.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" #include "handle_scope-inl.h" #include "thread.h" @@ -45,7 +45,7 @@ class ExceptionTest : public CommonRuntimeTest { ScopedObjectAccess soa(Thread::Current()); StackHandleScope<2> hs(soa.Self()); Handle<mirror::ClassLoader> class_loader( - hs.NewHandle(soa.Decode<mirror::ClassLoader*>(LoadDex("ExceptionHandle")))); + hs.NewHandle(soa.Decode<mirror::ClassLoader>(LoadDex("ExceptionHandle")))); my_klass_ = class_linker_->FindClass(soa.Self(), "LExceptionHandle;", class_loader); ASSERT_TRUE(my_klass_ != nullptr); Handle<mirror::Class> klass(hs.NewHandle(my_klass_)); @@ -219,7 +219,7 @@ TEST_F(ExceptionTest, StackTraceElement) { ASSERT_TRUE(internal != nullptr); jobjectArray ste_array = Thread::InternalStackTraceToStackTraceElementArray(soa, internal); ASSERT_TRUE(ste_array != nullptr); - auto* trace_array = soa.Decode<mirror::ObjectArray<mirror::StackTraceElement>*>(ste_array); + auto trace_array = soa.Decode<mirror::ObjectArray<mirror::StackTraceElement>>(ste_array); ASSERT_TRUE(trace_array != nullptr); ASSERT_TRUE(trace_array->Get(0) != nullptr); |