diff options
| author | 2016-10-25 15:08:01 -0700 | |
|---|---|---|
| committer | 2016-10-26 15:25:40 -0700 | |
| commit | ef41db7a3f322a1feb305fdb457410c4cea94d00 (patch) | |
| tree | c03152c091ef62ab70f5be0a2fe3a965b189132c /runtime/entrypoints/entrypoint_utils.h | |
| parent | 1458e0c09fe0a3b9fa5fd7beb9b6077d1fc46b1d (diff) | |
Move interpreter to ObjPtr
Moved most of interpreter, interpreter_common,
interpreter_switch_impl, and some of mterp to ObjPtr.
Bug: 31113334
Test: test-art-host ART_TEST_INTERPRETER=true
Test: art/tools/run-libcore-tests.sh '--mode=host' '--variant=X32' --debug
Change-Id: I0935d18287e1332205c17c5a018aa167788ab897
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 20c8401111..bcddfb0508 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -156,7 +156,7 @@ inline ArtField* FindFieldFromCode(uint32_t field_idx, template<InvokeType type, bool access_check> inline ArtMethod* FindMethodFromCode(uint32_t method_idx, - mirror::Object** this_object, + ObjPtr<mirror::Object>* this_object, ArtMethod* referrer, Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) @@ -171,7 +171,7 @@ inline ArtField* FindFieldFast(uint32_t field_idx, // Fast path method resolution that can't throw exceptions. inline ArtMethod* FindMethodFast(uint32_t method_idx, - mirror::Object* this_object, + ObjPtr<mirror::Object> this_object, ArtMethod* referrer, bool access_check, InvokeType type) @@ -203,7 +203,7 @@ JValue InvokeProxyInvocationHandler(ScopedObjectAccessAlreadyRunnable& soa, cons REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); -bool FillArrayData(mirror::Object* obj, const Instruction::ArrayDataPayload* payload) +bool FillArrayData(ObjPtr<mirror::Object> obj, const Instruction::ArrayDataPayload* payload) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); |