diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-28 20:54:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-28 20:54:49 +0000 |
| commit | e0205d519dd417f749243b42b8711dfa313e5390 (patch) | |
| tree | e16ea4abe8dc115955a63828d682e5910e277c5e /runtime/interpreter/interpreter_goto_table_impl.cc | |
| parent | e1e084034ed1dd0e3928f0d10dc0cebf80171c07 (diff) | |
| parent | 6786a58659420c0631a1ebe1f2fde434b8bcd1e4 (diff) | |
| download | android_art-e0205d519dd417f749243b42b8711dfa313e5390.tar.gz android_art-e0205d519dd417f749243b42b8711dfa313e5390.tar.bz2 android_art-e0205d519dd417f749243b42b8711dfa313e5390.zip | |
Merge "Remove ResolveString from MethodHelper."
Diffstat (limited to 'runtime/interpreter/interpreter_goto_table_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index 88d6544e80..b970879042 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -420,7 +420,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_STRING) { - String* s = ResolveString(self, mh, inst->VRegB_21c()); + String* s = ResolveString(self, shadow_frame, inst->VRegB_21c()); if (UNLIKELY(s == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { @@ -431,7 +431,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_STRING_JUMBO) { - String* s = ResolveString(self, mh, inst->VRegB_31c()); + String* s = ResolveString(self, shadow_frame, inst->VRegB_31c()); if (UNLIKELY(s == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { |