diff options
| author | 2016-10-04 13:54:57 -0700 | |
|---|---|---|
| committer | 2016-10-13 10:59:28 -0700 | |
| commit | 28bd2e4f151267b34b8e1eb19c489d8d547bbf5c (patch) | |
| tree | d99ae3fe74ea63b83091898d830d3efe68cd479d /runtime/interpreter/unstarted_runtime.cc | |
| parent | 6e5fa09510c7280168e040382d27dd8b55760d9a (diff) | |
Move mirror::Class to use ObjPtr
Leave the return types as non ObjPtr for now. Fixed moving GC bugs
in tests.
Test: test-art-host
Bug: 31113334
Change-Id: I5da1b5ac55dfbc5cc97a64be2c870ba9f512d9b0
Diffstat (limited to 'runtime/interpreter/unstarted_runtime.cc')
| -rw-r--r-- | runtime/interpreter/unstarted_runtime.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc index 845fc60b12..e12a6997e6 100644 --- a/runtime/interpreter/unstarted_runtime.cc +++ b/runtime/interpreter/unstarted_runtime.cc @@ -38,6 +38,7 @@ #include "gc/reference_processor.h" #include "handle_scope-inl.h" #include "interpreter/interpreter_common.h" +#include "jvalue-inl.h" #include "mirror/array-inl.h" #include "mirror/class.h" #include "mirror/field-inl.h" @@ -340,7 +341,7 @@ void UnstartedRuntime::UnstartedClassGetDeclaredMethod( Runtime* runtime = Runtime::Current(); bool transaction = runtime->IsActiveTransaction(); PointerSize pointer_size = runtime->GetClassLinker()->GetImagePointerSize(); - mirror::Method* method; + ObjPtr<mirror::Method> method; if (transaction) { if (pointer_size == PointerSize::k64) { method = mirror::Class::GetDeclaredMethodInternal<PointerSize::k64, true>( @@ -374,7 +375,7 @@ void UnstartedRuntime::UnstartedClassGetDeclaredConstructor( Runtime* runtime = Runtime::Current(); bool transaction = runtime->IsActiveTransaction(); PointerSize pointer_size = runtime->GetClassLinker()->GetImagePointerSize(); - mirror::Constructor* constructor; + ObjPtr<mirror::Constructor> constructor; if (transaction) { if (pointer_size == PointerSize::k64) { constructor = mirror::Class::GetDeclaredConstructorInternal<PointerSize::k64, |