diff options
Diffstat (limited to 'compiler/exception_test.cc')
| -rw-r--r-- | compiler/exception_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index e2235345b7..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_)); @@ -170,7 +170,7 @@ TEST_F(ExceptionTest, StackTraceElement) { Runtime* r = Runtime::Current(); r->SetInstructionSet(kRuntimeISA); ArtMethod* save_method = r->CreateCalleeSaveMethod(); - r->SetCalleeSaveMethod(save_method, Runtime::kSaveAll); + r->SetCalleeSaveMethod(save_method, Runtime::kSaveAllCalleeSaves); QuickMethodFrameInfo frame_info = r->GetRuntimeMethodFrameInfo(save_method); ASSERT_EQ(kStackAlignment, 16U); @@ -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); |