commit 423bebb17f15c3867a52315f0ae421f08f14544f
author Vladimir Marko <vmarko@google.com> Tue Mar 26 15:17:21 2019 +0000
committer Vladimir Marko <vmarko@google.com> Wed Mar 27 09:45:20 2019 +0000
tree 97bdf50c7144ae21e6abfe8bdc26858a6a10f94d
parent 93d99f3665cbd890509f4c707e1a62c5f26d320e

ObjPtr<>-ify mirror::ObjectArray.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I611b3e49d3feed306f6cd35d2b662a1e727e24c6

runtime/mirror/emulated_stack_frame.cc

diff --git a/runtime/mirror/emulated_stack_frame.cc b/runtime/mirror/emulated_stack_frame.cc
index 001469c..6ae577c 100644
--- a/runtime/mirror/emulated_stack_frame.cc
+++ b/runtime/mirror/emulated_stack_frame.cc
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-#include "emulated_stack_frame.h"
+#include "emulated_stack_frame-inl.h"
 
 #include "array-alloc-inl.h"
 #include "array-inl.h"
 #include "class-alloc-inl.h"
 #include "class_root.h"
+#include "handle.h"
 #include "jvalue-inl.h"
 #include "method_handles-inl.h"
 #include "method_handles.h"
+#include "method_type.h"
 #include "object_array-alloc-inl.h"
 #include "object_array-inl.h"
 #include "reflection-inl.h"
@@ -141,7 +143,7 @@
   DISALLOW_COPY_AND_ASSIGN(EmulatedStackFrameAccessor);
 };
 
-mirror::EmulatedStackFrame* EmulatedStackFrame::CreateFromShadowFrameAndArgs(
+ObjPtr<mirror::EmulatedStackFrame> EmulatedStackFrame::CreateFromShadowFrameAndArgs(
     Thread* self,
     Handle<mirror::MethodType> caller_type,
     Handle<mirror::MethodType> callee_type,