diff options
author | 2019-10-04 08:38:11 +0000 | |
---|---|---|
committer | 2019-10-04 08:38:38 +0000 | |
commit | 712fa800b2b78e527d36c88dc369bf4b723587ea (patch) | |
tree | ccc4573a3c6bef136ef6da022350ebb5c17a1892 /runtime/common_dex_operations.h | |
parent | f70dfec27cae2625c199f1b8ecf1ef1f23580a45 (diff) |
Revert "Walk internal ArtField/ArtMethod pointers"
This reverts commit c84fc3a742b160ce51cbf01c2e5f971ccc0a2c6c.
Bug: 134162467
Reason for revert: Test fails on debuggable.
Change-Id: I240d58fafcc7434749947330b64c67d65b9b7a1e
Diffstat (limited to 'runtime/common_dex_operations.h')
-rw-r--r-- | runtime/common_dex_operations.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/runtime/common_dex_operations.h b/runtime/common_dex_operations.h index 882e3ce4c7..2f86fbcca6 100644 --- a/runtime/common_dex_operations.h +++ b/runtime/common_dex_operations.h @@ -35,8 +35,6 @@ #include "mirror/class.h" #include "mirror/object.h" #include "obj_ptr-inl.h" -#include "reflective_handle.h" -#include "reflective_handle_scope.h" #include "runtime.h" #include "stack.h" #include "thread.h" @@ -102,10 +100,8 @@ static ALWAYS_INLINE bool DoFieldGetCommon(Thread* self, instrumentation::Instrumentation* instrumentation = Runtime::Current()->GetInstrumentation(); if (UNLIKELY(instrumentation->HasFieldReadListeners())) { StackHandleScope<1> hs(self); - StackArtFieldHandleScope<1> rhs(self); // Wrap in handle wrapper in case the listener does thread suspension. HandleWrapperObjPtr<mirror::Object> h(hs.NewHandleWrapper(&obj)); - ReflectiveHandleWrapper<ArtField> fh(rhs.NewReflectiveHandleWrapper(&field)); ObjPtr<mirror::Object> this_object; if (!field->IsStatic()) { this_object = obj; @@ -163,10 +159,8 @@ ALWAYS_INLINE bool DoFieldPutCommon(Thread* self, instrumentation::Instrumentation* instrumentation = Runtime::Current()->GetInstrumentation(); if (UNLIKELY(instrumentation->HasFieldWriteListeners())) { StackHandleScope<2> hs(self); - StackArtFieldHandleScope<1> rhs(self); // Save this and return value (if needed) in case the instrumentation causes a suspend. HandleWrapperObjPtr<mirror::Object> h(hs.NewHandleWrapper(&obj)); - ReflectiveHandleWrapper<ArtField> fh(rhs.NewReflectiveHandleWrapper(&field)); ObjPtr<mirror::Object> this_object = field->IsStatic() ? nullptr : obj; mirror::Object* fake_root = nullptr; HandleWrapper<mirror::Object> ret(hs.NewHandleWrapper<mirror::Object>( @@ -216,10 +210,8 @@ ALWAYS_INLINE bool DoFieldPutCommon(Thread* self, ObjPtr<mirror::Class> field_class; { StackHandleScope<2> hs(self); - StackArtFieldHandleScope<1> rhs(self); HandleWrapperObjPtr<mirror::Object> h_reg(hs.NewHandleWrapper(®)); HandleWrapperObjPtr<mirror::Object> h_obj(hs.NewHandleWrapper(&obj)); - ReflectiveHandleWrapper<ArtField> fh(rhs.NewReflectiveHandleWrapper(&field)); field_class = field->ResolveType(); } // ArtField::ResolveType() may fail as evidenced with a dexing bug (b/78788577). |