diff options
| author | 2019-10-07 07:15:53 +0000 | |
|---|---|---|
| committer | 2019-10-07 07:16:18 +0000 | |
| commit | c34eab45161c51bf63e548e44645cbcc59d01268 (patch) | |
| tree | 1b2a0eb85865d2cf6b1627cb5d64869e72412505 /runtime/entrypoints/entrypoint_utils-inl.h | |
| parent | 623d4f1ba4f4218c5472e3d9e1e9bf707795878d (diff) | |
Revert "Revert^2 "Walk internal ArtField/ArtMethod pointers""
This reverts commit ea2a3d949354c8b054983ba629c81bc5ff7163da.
Bug: 134162467
Reason for revert: Fails redefine stress
Change-Id: If487c0bcacaf3a3f565ff475b6dad8321e3428b9
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils-inl.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils-inl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index fe12a7c379..255607937e 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -39,7 +39,6 @@ #include "mirror/object-inl.h" #include "mirror/throwable.h" #include "nth_caller_visitor.h" -#include "reflective_handle_scope-inl.h" #include "runtime.h" #include "stack_map.h" #include "thread.h" @@ -382,11 +381,9 @@ inline ArtField* FindFieldFromCode(uint32_t field_idx, return resolved_field; } else { StackHandleScope<1> hs(self); - StackArtFieldHandleScope<1> rhs(self); - ReflectiveHandle<ArtField> resolved_field_handle(rhs.NewHandle(resolved_field)); if (LIKELY(class_linker->EnsureInitialized(self, hs.NewHandle(fields_class), true, true))) { // Otherwise let's ensure the class is initialized before resolving the field. - return resolved_field_handle.Get(); + return resolved_field; } DCHECK(self->IsExceptionPending()); // Throw exception and unwind return nullptr; // Failure. |