diff options
| author | 2016-10-03 18:01:28 -0700 | |
|---|---|---|
| committer | 2016-10-04 10:46:16 -0700 | |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/interpreter/interpreter_common.cc | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode.
Bug: 31113334
Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index 7a6162cd07..e677cfbfe8 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -68,7 +68,7 @@ bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, const Instruction* inst this_object = obj; } instrumentation->FieldReadEvent(self, - this_object.Decode(), + this_object.Ptr(), shadow_frame.GetMethod(), shadow_frame.GetDexPC(), f); @@ -94,7 +94,7 @@ bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, const Instruction* inst shadow_frame.SetVRegLong(vregA, f->GetLong(obj)); break; case Primitive::kPrimNot: - shadow_frame.SetVRegReference(vregA, f->GetObject(obj).Decode()); + shadow_frame.SetVRegReference(vregA, f->GetObject(obj).Ptr()); break; default: LOG(FATAL) << "Unreachable: " << field_type; @@ -271,7 +271,7 @@ bool DoFieldPut(Thread* self, const ShadowFrame& shadow_frame, const Instruction HandleWrapperObjPtr<mirror::Object> h(hs.NewHandleWrapper(&obj)); JValue field_value = GetFieldValue<field_type>(shadow_frame, vregA); ObjPtr<Object> this_object = f->IsStatic() ? nullptr : obj; - instrumentation->FieldWriteEvent(self, this_object.Decode(), + instrumentation->FieldWriteEvent(self, this_object.Ptr(), shadow_frame.GetMethod(), shadow_frame.GetDexPC(), f, @@ -308,7 +308,7 @@ bool DoFieldPut(Thread* self, const ShadowFrame& shadow_frame, const Instruction HandleWrapperObjPtr<mirror::Object> h_obj(hs.NewHandleWrapper(&obj)); field_class = f->GetType<true>(); } - if (!reg->VerifierInstanceOf(field_class.Decode())) { + if (!reg->VerifierInstanceOf(field_class.Ptr())) { // This should never happen. std::string temp1, temp2, temp3; self->ThrowNewExceptionF("Ljava/lang/VirtualMachineError;", |