diff options
author | 2018-06-04 09:14:42 +0000 | |
---|---|---|
committer | 2018-06-04 09:14:42 +0000 | |
commit | 9ddef18ae95859a985e7a0de7e22999fcbc28e07 (patch) | |
tree | ff38945fc61f1e32717a18b0a6901c5d11c33ccb /runtime/thread.cc | |
parent | 0366f3251c3078a0161d178e3b0afd5efc4c84c0 (diff) | |
parent | bcf175247272d0e321c8d988c3c01c123b56e36e (diff) |
Merge "ObjPtr<>-ify array allocations."
Diffstat (limited to 'runtime/thread.cc')
-rw-r--r-- | runtime/thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index b59606a06b..a8133a1fda 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -491,7 +491,7 @@ Thread* Thread::FromManagedThread(const ScopedObjectAccessAlreadyRunnable& soa, Thread* Thread::FromManagedThread(const ScopedObjectAccessAlreadyRunnable& soa, jobject java_thread) { - return FromManagedThread(soa, soa.Decode<mirror::Object>(java_thread).Ptr()); + return FromManagedThread(soa, soa.Decode<mirror::Object>(java_thread)); } static size_t FixStackSize(size_t stack_size) { @@ -2728,7 +2728,7 @@ jobjectArray Thread::InternalStackTraceToStackTraceElementArray( depth = std::min(depth, traces_length); } else { // Create java_trace array and place in local reference table - mirror::ObjectArray<mirror::StackTraceElement>* java_traces = + ObjPtr<mirror::ObjectArray<mirror::StackTraceElement>> java_traces = class_linker->AllocStackTraceElementArray(soa.Self(), depth); if (java_traces == nullptr) { return nullptr; |