commit f7aaacd97881c6924b8212c7f8fe4a4c8721ef53
author Hiroshi Yamauchi <yamauchi@google.com> Thu Jan 12 02:58:38 2017 +0000
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Jan 12 02:58:38 2017 +0000
tree 780209ac8e992fa63307062977f672aa5bb55d9e
parent 2b615ba29c4dfcf54aaf44955f2eac60f5080b2e

Revert "Make object allocation entrypoints only take a class."

960-default-smali64 is failing.

This reverts commit 2b615ba29c4dfcf54aaf44955f2eac60f5080b2e.

Change-Id: Iebb8ee5a917fa84c5f01660ce432798524d078ef

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 33c6a40..aff12ff 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -2627,9 +2627,10 @@
   QUICK_ENTRY_POINT_INFO(pAllocArray)
   QUICK_ENTRY_POINT_INFO(pAllocArrayResolved)
   QUICK_ENTRY_POINT_INFO(pAllocArrayWithAccessCheck)
+  QUICK_ENTRY_POINT_INFO(pAllocObject)
   QUICK_ENTRY_POINT_INFO(pAllocObjectResolved)
   QUICK_ENTRY_POINT_INFO(pAllocObjectInitialized)
-  QUICK_ENTRY_POINT_INFO(pAllocObjectWithChecks)
+  QUICK_ENTRY_POINT_INFO(pAllocObjectWithAccessCheck)
   QUICK_ENTRY_POINT_INFO(pCheckAndAllocArray)
   QUICK_ENTRY_POINT_INFO(pCheckAndAllocArrayWithAccessCheck)
   QUICK_ENTRY_POINT_INFO(pAllocStringFromBytes)