summaryrefslogtreecommitdiff
path: root/runtime/common_dex_operations.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2017-03-09 09:03:19 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2017-03-09 09:03:19 +0000
commit01822299e8c3a7827d6613cd08fca6aa52c4ae42 (patch)
tree0091c82b4f3b239b6b28418062954b9a0583261d /runtime/common_dex_operations.h
parentdf79ddb545f0d6e71d6eebb9cb94aa6916351ee9 (diff)
Revert "Stop interpreter from accessing code items of compiled code."
Bug: 35800981 This reverts commit df79ddb545f0d6e71d6eebb9cb94aa6916351ee9. Change-Id: I04b1cb8d002ca330c0aa6e68b431c7f80c2779d6
Diffstat (limited to 'runtime/common_dex_operations.h')
-rw-r--r--runtime/common_dex_operations.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/common_dex_operations.h b/runtime/common_dex_operations.h
index 8776061433..6693eefa5a 100644
--- a/runtime/common_dex_operations.h
+++ b/runtime/common_dex_operations.h
@@ -36,8 +36,8 @@ namespace interpreter {
void ArtInterpreterToCompiledCodeBridge(Thread* self,
ArtMethod* caller,
+ const DexFile::CodeItem* code_item,
ShadowFrame* shadow_frame,
- uint16_t arg_offset,
JValue* result);
} // namespace interpreter
@@ -56,7 +56,7 @@ inline void PerformCall(Thread* self,
interpreter::ArtInterpreterToInterpreterBridge(self, code_item, callee_frame, result);
} else {
interpreter::ArtInterpreterToCompiledCodeBridge(
- self, caller_method, callee_frame, first_dest_reg, result);
+ self, caller_method, code_item, callee_frame, result);
}
} else {
interpreter::UnstartedRuntime::Invoke(self, code_item, callee_frame, result, first_dest_reg);