commit 253ea073ec03a0be1e22df98957257594e316a39
author Hiroshi Yamauchi <yamauchi@google.com> Wed Oct 02 12:44:17 2013 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Wed Oct 02 13:34:17 2013 -0700
tree 804fbc5b00ef7d0b399aa70960793ce5b50eb2ae
parent 7ef126ce0593929bcf8fb73d8b1119ce3b95b3f2

Fix an Art debug build boot failure.

(The original change is 3b4c18933c24b8a33f38573c2ebcdb9aa16efeb5.)

Bug: 11003273
Bug: 9986565
Change-Id: Iaaf6395f171eb6e6b8c99386c20c4970c53ee00d

runtime/interpreter/interpreter_switch_impl.cc

diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index dcc86e8..c3977c6 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -422,8 +422,8 @@
       }
       case Instruction::NEW_INSTANCE: {
         PREAMBLE();
-        Object* obj = AllocObjectFromCode(inst->VRegB_21c(), shadow_frame.GetMethod(),
-                                          self, do_access_check);
+        Object* obj = AllocObjectFromCodeInstrumented(inst->VRegB_21c(), shadow_frame.GetMethod(),
+                                                      self, do_access_check);
         if (UNLIKELY(obj == NULL)) {
           HANDLE_PENDING_EXCEPTION();
         } else {
@@ -435,8 +435,8 @@
       case Instruction::NEW_ARRAY: {
         PREAMBLE();
         int32_t length = shadow_frame.GetVReg(inst->VRegB_22c(inst_data));
-        Object* obj = AllocArrayFromCode(inst->VRegC_22c(), shadow_frame.GetMethod(),
-                                         length, self, do_access_check);
+        Object* obj = AllocArrayFromCodeInstrumented(inst->VRegC_22c(), shadow_frame.GetMethod(),
+                                                     length, self, do_access_check);
         if (UNLIKELY(obj == NULL)) {
           HANDLE_PENDING_EXCEPTION();
         } else {