diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/proxy_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/proxy_test.cc')
| -rw-r--r-- | runtime/proxy_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/proxy_test.cc b/runtime/proxy_test.cc index e3f92c7af0..43b0b3d4ff 100644 --- a/runtime/proxy_test.cc +++ b/runtime/proxy_test.cc @@ -23,7 +23,7 @@ #include "common_compiler_test.h" #include "mirror/field-inl.h" #include "mirror/method.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" namespace art { @@ -108,7 +108,7 @@ TEST_F(ProxyTest, ProxyClassHelper) { jobject jclass_loader = LoadDex("Interfaces"); StackHandleScope<4> hs(soa.Self()); Handle<mirror::ClassLoader> class_loader( - hs.NewHandle(soa.Decode<mirror::ClassLoader*>(jclass_loader))); + hs.NewHandle(soa.Decode<mirror::ClassLoader>(jclass_loader))); Handle<mirror::Class> I(hs.NewHandle( class_linker_->FindClass(soa.Self(), "LInterfaces$I;", class_loader))); @@ -142,7 +142,7 @@ TEST_F(ProxyTest, ProxyFieldHelper) { jobject jclass_loader = LoadDex("Interfaces"); StackHandleScope<9> hs(soa.Self()); Handle<mirror::ClassLoader> class_loader( - hs.NewHandle(soa.Decode<mirror::ClassLoader*>(jclass_loader))); + hs.NewHandle(soa.Decode<mirror::ClassLoader>(jclass_loader))); Handle<mirror::Class> I(hs.NewHandle( class_linker_->FindClass(soa.Self(), "LInterfaces$I;", class_loader))); @@ -200,7 +200,7 @@ TEST_F(ProxyTest, CheckArtMirrorFieldsOfProxyStaticFields) { jobject jclass_loader = LoadDex("Interfaces"); StackHandleScope<7> hs(soa.Self()); Handle<mirror::ClassLoader> class_loader( - hs.NewHandle(soa.Decode<mirror::ClassLoader*>(jclass_loader))); + hs.NewHandle(soa.Decode<mirror::ClassLoader>(jclass_loader))); Handle<mirror::Class> proxyClass0; Handle<mirror::Class> proxyClass1; |