From 90f12677f80169dc3ef919c2067349f94b943e7f Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Tue, 24 May 2022 14:49:25 +0000 Subject: Don't use instrumentation stubs for native methods in debuggable Don't install instrumentation stubs for native methods in debuggable runtimes. The GenericJniTrampoline is updated to call method entry / exit hooks. When JITing JNI stubs in debuggable runtimes we also include calls to method entry / exit hooks when required. Bug: 206029744 Test: art/test.py Change-Id: I1d92ddb1d03daed74d88f5c70d38427dc6055446 --- runtime/thread.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/thread.cc') diff --git a/runtime/thread.cc b/runtime/thread.cc index 0c536090b1..94c539f592 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -3592,6 +3592,7 @@ void Thread::DumpThreadOffset(std::ostream& os, uint32_t offset) { QUICK_ENTRY_POINT_INFO(pAputObject) QUICK_ENTRY_POINT_INFO(pJniMethodStart) QUICK_ENTRY_POINT_INFO(pJniMethodEnd) + QUICK_ENTRY_POINT_INFO(pJniMethodEntryHook) QUICK_ENTRY_POINT_INFO(pJniDecodeReferenceResult) QUICK_ENTRY_POINT_INFO(pJniLockObject) QUICK_ENTRY_POINT_INFO(pJniUnlockObject) -- cgit v1.2.3-59-g8ed1b