diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2013-10-02 12:44:17 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2013-10-02 13:34:17 -0700 |
| commit | 253ea073ec03a0be1e22df98957257594e316a39 (patch) | |
| tree | 804fbc5b00ef7d0b399aa70960793ce5b50eb2ae /runtime/interpreter/interpreter_switch_impl.cc | |
| parent | 7ef126ce0593929bcf8fb73d8b1119ce3b95b3f2 (diff) | |
| download | art-253ea073ec03a0be1e22df98957257594e316a39.zip art-253ea073ec03a0be1e22df98957257594e316a39.tar.gz art-253ea073ec03a0be1e22df98957257594e316a39.tar.bz2 | |
Fix an Art debug build boot failure.
(The original change is 3b4c18933c24b8a33f38573c2ebcdb9aa16efeb5.)
Bug: 11003273
Bug: 9986565
Change-Id: Iaaf6395f171eb6e6b8c99386c20c4970c53ee00d
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem } 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 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem 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 { |