Add a nterp trampoline in the oat file, replaced at runtime.
To avoid checking whether an ArtMethod can run nterp when loading an
image, record that information directly in the image, and patch the
entrypoint so nterp can do direct pointer checks when calling an
ArtMethod.
Test: test.py
Bug: 177444058
Change-Id: Ia87367c37848e1efe33336b3677490c07d7e1767
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index f396a0a..ac97946 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -129,6 +129,7 @@
#include "mirror/var_handle.h"
#include "native/dalvik_system_DexFile.h"
#include "nativehelper/scoped_local_ref.h"
+#include "nterp_helpers.h"
#include "oat.h"
#include "oat_file-inl.h"
#include "oat_file.h"
@@ -231,7 +232,7 @@
REQUIRES_SHARED(Locks::mutator_lock_) {
Runtime* runtime = Runtime::Current();
if (class_linker->IsQuickToInterpreterBridge(method->GetEntryPointFromQuickCompiledCode()) &&
- interpreter::CanMethodUseNterp(method)) {
+ CanMethodUseNterp(method)) {
if (method->GetDeclaringClass()->IsVisiblyInitialized() ||
!NeedsClinitCheckBeforeCall(method)) {
runtime->GetInstrumentation()->UpdateMethodsCode(method, interpreter::GetNterpEntryPoint());
@@ -702,6 +703,7 @@
quick_imt_conflict_trampoline_(nullptr),
quick_generic_jni_trampoline_(nullptr),
quick_to_interpreter_bridge_trampoline_(nullptr),
+ nterp_trampoline_(nullptr),
image_pointer_size_(kRuntimePointerSize),
visibly_initialized_callback_lock_("visibly initialized callback lock"),
visibly_initialized_callback_(nullptr),
@@ -929,6 +931,7 @@
quick_imt_conflict_trampoline_ = GetQuickImtConflictStub();
quick_generic_jni_trampoline_ = GetQuickGenericJniStub();
quick_to_interpreter_bridge_trampoline_ = GetQuickToInterpreterBridge();
+ nterp_trampoline_ = interpreter::GetNterpEntryPoint();
}
// Object, String, ClassExt and DexCache need to be rerun through FindSystemClass to finish init
@@ -1216,6 +1219,7 @@
const void* quick_imt_conflict_trampoline;
const void* quick_generic_jni_trampoline;
const void* quick_to_interpreter_bridge_trampoline;
+ const void* nterp_trampoline;
PointerSize pointer_size;
ArtMethod* m;
bool error;
@@ -1282,6 +1286,7 @@
quick_imt_conflict_trampoline_ = default_oat_header.GetQuickImtConflictTrampoline();
quick_generic_jni_trampoline_ = default_oat_header.GetQuickGenericJniTrampoline();
quick_to_interpreter_bridge_trampoline_ = default_oat_header.GetQuickToInterpreterBridge();
+ nterp_trampoline_ = default_oat_header.GetNterpTrampoline();
if (kIsDebugBuild) {
// Check that the other images use the same trampoline.
for (size_t i = 1; i < oat_files.size(); ++i) {
@@ -1298,12 +1303,15 @@
ith_oat_header.GetQuickGenericJniTrampoline();
const void* ith_quick_to_interpreter_bridge_trampoline =
ith_oat_header.GetQuickToInterpreterBridge();
+ const void* ith_nterp_trampoline =
+ ith_oat_header.GetNterpTrampoline();
if (ith_jni_dlsym_lookup_trampoline_ != jni_dlsym_lookup_trampoline_ ||
ith_jni_dlsym_lookup_critical_trampoline_ != jni_dlsym_lookup_critical_trampoline_ ||
ith_quick_resolution_trampoline != quick_resolution_trampoline_ ||
ith_quick_imt_conflict_trampoline != quick_imt_conflict_trampoline_ ||
ith_quick_generic_jni_trampoline != quick_generic_jni_trampoline_ ||
- ith_quick_to_interpreter_bridge_trampoline != quick_to_interpreter_bridge_trampoline_) {
+ ith_quick_to_interpreter_bridge_trampoline != quick_to_interpreter_bridge_trampoline_ ||
+ ith_nterp_trampoline != nterp_trampoline_) {
// Make sure that all methods in this image do not contain those trampolines as
// entrypoints. Otherwise the class-linker won't be able to work with a single set.
TrampolineCheckData data;
@@ -1313,6 +1321,7 @@
data.quick_imt_conflict_trampoline = ith_quick_imt_conflict_trampoline;
data.quick_generic_jni_trampoline = ith_quick_generic_jni_trampoline;
data.quick_to_interpreter_bridge_trampoline = ith_quick_to_interpreter_bridge_trampoline;
+ data.nterp_trampoline = ith_nterp_trampoline;
ReaderMutexLock mu(self, *Locks::heap_bitmap_lock_);
auto visitor = [&](mirror::Object* obj) REQUIRES_SHARED(Locks::mutator_lock_) {
if (obj->IsClass()) {
@@ -2048,8 +2057,12 @@
}
// Set image methods' entry point that point to the interpreter bridge to the
// nterp entry point.
- if (can_use_nterp) {
- ChangeInterpreterBridgeToNterp(&method, this);
+ if (method.GetEntryPointFromQuickCompiledCode() == nterp_trampoline_) {
+ if (can_use_nterp) {
+ method.SetEntryPointFromQuickCompiledCode(interpreter::GetNterpEntryPoint());
+ } else {
+ method.SetEntryPointFromQuickCompiledCode(GetQuickToInterpreterBridge());
+ }
}
}, space->Begin(), image_pointer_size_);
}
@@ -3392,7 +3405,7 @@
return GetQuickGenericJniStub();
}
- if (interpreter::CanRuntimeUseNterp() && interpreter::CanMethodUseNterp(method)) {
+ if (interpreter::CanRuntimeUseNterp() && CanMethodUseNterp(method)) {
return interpreter::GetNterpEntryPoint();
}
@@ -3521,7 +3534,7 @@
if (quick_code == nullptr &&
interpreter::CanRuntimeUseNterp() &&
- interpreter::CanMethodUseNterp(method)) {
+ CanMethodUseNterp(method)) {
quick_code = interpreter::GetNterpEntryPoint();
}