diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/arch/stub_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 'runtime/arch/stub_test.cc')
| -rw-r--r-- | runtime/arch/stub_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc index 3424e3c0d2..5e39f42814 100644 --- a/runtime/arch/stub_test.cc +++ b/runtime/arch/stub_test.cc @@ -26,7 +26,7 @@ #include "linear_alloc.h" #include "mirror/class-inl.h" #include "mirror/string-inl.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" namespace art { @@ -1796,7 +1796,7 @@ static void TestFields(Thread* self, StubTest* test, Primitive::Type test_type) ScopedObjectAccess soa(self); StackHandleScope<3> hs(self); - Handle<mirror::Object> obj(hs.NewHandle(soa.Decode<mirror::Object*>(o))); + Handle<mirror::Object> obj(hs.NewHandle(soa.Decode<mirror::Object>(o))); Handle<mirror::Class> c(hs.NewHandle(obj->GetClass())); // Need a method as a referrer ArtMethod* m = c->GetDirectMethod(0, kRuntimePointerSize); @@ -1995,11 +1995,11 @@ TEST_F(StubTest, DISABLED_IMT) { jobject jarray_list = env->NewObject(arraylist_jclass, arraylist_constructor); ASSERT_NE(nullptr, jarray_list); - Handle<mirror::Object> array_list(hs.NewHandle(soa.Decode<mirror::Object*>(jarray_list))); + Handle<mirror::Object> array_list(hs.NewHandle(soa.Decode<mirror::Object>(jarray_list))); jobject jobj = env->NewObject(obj_jclass, obj_constructor); ASSERT_NE(nullptr, jobj); - Handle<mirror::Object> obj(hs.NewHandle(soa.Decode<mirror::Object*>(jobj))); + Handle<mirror::Object> obj(hs.NewHandle(soa.Decode<mirror::Object>(jobj))); // Invocation tests. |