diff options
| author | 2016-09-27 18:43:30 -0700 | |
|---|---|---|
| committer | 2016-09-29 17:31:09 -0700 | |
| commit | 0795f23920ee9aabf28e45c63cd592dcccf00216 (patch) | |
| tree | ff3f880c5e84f3316532b47d0e9a7729ade848ac /runtime/art_method.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/art_method.cc')
| -rw-r--r-- | runtime/art_method.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/art_method.cc b/runtime/art_method.cc index 193bea167f..c97c32837d 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -40,7 +40,7 @@ #include "mirror/object-inl.h" #include "mirror/string.h" #include "oat_file-inl.h" -#include "scoped_thread_state_change.h" +#include "scoped_thread_state_change-inl.h" #include "well_known_classes.h" namespace art { @@ -52,7 +52,7 @@ extern "C" void art_quick_invoke_static_stub(ArtMethod*, uint32_t*, uint32_t, Th ArtMethod* ArtMethod::FromReflectedMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject jlr_method) { - auto* executable = soa.Decode<mirror::Executable*>(jlr_method); + ObjPtr<mirror::Executable> executable = soa.Decode<mirror::Executable>(jlr_method); DCHECK(executable != nullptr); return executable->GetArtMethod(); } @@ -350,7 +350,7 @@ bool ArtMethod::IsAnnotatedWith(jclass klass, uint32_t visibility) { ScopedObjectAccess soa(self); StackHandleScope<1> shs(self); - mirror::Class* annotation = soa.Decode<mirror::Class*>(klass); + ObjPtr<mirror::Class> annotation = soa.Decode<mirror::Class>(klass); DCHECK(annotation->IsAnnotation()); Handle<mirror::Class> annotation_handle(shs.NewHandle(annotation)); |