summaryrefslogtreecommitdiff
path: root/runtime/method_handles.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2018-06-04 09:14:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-06-04 09:14:42 +0000
commit9ddef18ae95859a985e7a0de7e22999fcbc28e07 (patch)
treeff38945fc61f1e32717a18b0a6901c5d11c33ccb /runtime/method_handles.cc
parent0366f3251c3078a0161d178e3b0afd5efc4c84c0 (diff)
parentbcf175247272d0e321c8d988c3c01c123b56e36e (diff)
Merge "ObjPtr<>-ify array allocations."
Diffstat (limited to 'runtime/method_handles.cc')
-rw-r--r--runtime/method_handles.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/method_handles.cc b/runtime/method_handles.cc
index 28df1749a4..01a32a2288 100644
--- a/runtime/method_handles.cc
+++ b/runtime/method_handles.cc
@@ -268,7 +268,7 @@ bool ConvertJValueCommon(
// Then perform the actual boxing, and then set the reference.
ObjPtr<mirror::Object> boxed = BoxPrimitive(type, src_value);
- value->SetL(boxed.Ptr());
+ value->SetL(boxed);
return true;
} else {
// The source type is a reference and the target type is a primitive, so we must unbox.
@@ -323,7 +323,7 @@ inline void CopyArgumentsFromCallerFrame(const ShadowFrame& caller_frame,
// Note: As an optimization, non-moving collectors leave a stale reference value
// in the references array even after the original vreg was overwritten to a non-reference.
if (src_value == reinterpret_cast<uintptr_t>(o.Ptr())) {
- callee_frame->SetVRegReference(dst_reg, o.Ptr());
+ callee_frame->SetVRegReference(dst_reg, o);
} else {
callee_frame->SetVReg(dst_reg, src_value);
}