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/interpreter/interpreter_switch_impl.cc

diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index d7dfcd4..b0d7fb2 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -508,8 +508,9 @@
             gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator();
             obj = mirror::String::AllocEmptyString<true>(self, allocator_type);
           } else {
-            obj = AllocObjectFromCode<true>(
-                c.Ptr(),
+            obj = AllocObjectFromCode<do_access_check, true>(
+                dex::TypeIndex(inst->VRegB_21c()),
+                shadow_frame.GetMethod(),
                 self,
                 Runtime::Current()->GetHeap()->GetCurrentAllocator());
           }