From a59d9b228b1eda3bf71a81b6201ec64e26086c23 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 26 Sep 2016 18:13:17 -0700 Subject: Use ObjPtr for reflection.cc/h/inl Changed Pretty helpers to use this to reduce usage of Decode. The eventual goal is not have almost any calls to ObjPtr::Decode. Moved ObjPtr out of mirror namespace for convenience. Added more PoisonObjectPointers calls in class linker, thread suspension. Bug: 31113334 Test: test-art-host Change-Id: I44d08db5143d95ed1b65e2f00f9749ef5cf379f7 --- runtime/entrypoints/entrypoint_utils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/entrypoints/entrypoint_utils.cc') diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index fd9ffbd04d..bfa2b69045 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -160,7 +160,7 @@ JValue InvokeProxyInvocationHandler(ScopedObjectAccessAlreadyRunnable& soa, cons } else { JValue jv; jv.SetJ(args.at(i).j); - mirror::Object* val = BoxPrimitive(Primitive::GetType(shorty[i + 1]), jv); + mirror::Object* val = BoxPrimitive(Primitive::GetType(shorty[i + 1]), jv).Decode(); if (val == nullptr) { CHECK(soa.Self()->IsExceptionPending()); return zero; -- cgit v1.2.3-59-g8ed1b