summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2022-07-23 15:43:10 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2022-07-25 09:23:56 +0000
commitb86527a04011bbc97cbb1ce80c515e3b720dc5b5 (patch)
treef324db89bed00432256d08019a323a7c47ae077d /runtime/interpreter/interpreter.cc
parentb01f2487747e5d8f0e4aeea990a976d4212dea5a (diff)
Reland "Use the thread local cache in interpreter / unresolved entrypoints"
This reverts commit 27aecbb0180a98a672a8ab96b763d0864105d266. Reason for revert: Removed obsolete DCHECK. Change-Id: I993e509b6e79c7436fd1b6dec5e2d466eaffbd1a
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
-rw-r--r--runtime/interpreter/interpreter.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc
index 0ffc38beeb..6f0a5c9212 100644
--- a/runtime/interpreter/interpreter.cc
+++ b/runtime/interpreter/interpreter.cc
@@ -511,7 +511,7 @@ void EnterInterpreterFromDeoptimize(Thread* self,
new_dex_pc = dex_pc + instr->SizeInCodeUnits();
} else if (instr->IsInvoke()) {
DCHECK(deopt_method_type == DeoptimizationMethodType::kDefault);
- if (IsStringInit(instr, shadow_frame->GetMethod())) {
+ if (IsStringInit(*instr, shadow_frame->GetMethod())) {
uint16_t this_obj_vreg = GetReceiverRegisterForStringInit(instr);
// Move the StringFactory.newStringFromChars() result into the register representing
// "this object" when invoking the string constructor in the original dex instruction.